From 03779a58bcf5fa0c413ae28d218faf7630aa056a Mon Sep 17 00:00:00 2001
From: Prashanth Mundkur
Date: Mon, 10 Sep 2018 18:46:58 -0700
Subject: RTS: allow elf-loader to provide entry info.

---
 lib/elf.c | 13 +++++++------
 lib/elf.h |  4 +++-
 lib/rts.c |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'lib')

diff --git a/lib/elf.c b/lib/elf.c
index 8c5c5f56..e1eae1b7 100644
--- a/lib/elf.c
+++ b/lib/elf.c
@@ -306,7 +306,7 @@ void loadProgHdr64(bool le, const char* buffer, Elf64_Off off, const int total_f
     }
 }
 
-void loadELFHdr(const char* buffer, const int total_file_size) {
+void loadELFHdr(const char* buffer, const int total_file_size, bool *is32bit_p, uint64_t *entry) {
     if (total_file_size < sizeof(Elf32_Ehdr)) {
         fprintf(stderr, "File too small, not big enough even for 32-bit ELF header\n");
         exit(EXIT_FAILURE);
@@ -333,7 +333,8 @@ void loadELFHdr(const char* buffer, const int total_file_size) {
 	for(int i = 0; i < rdHalf32(le, ehdr->e_phnum); ++i) {
 	  loadProgHdr32(le, buffer, rdOff32(le, ehdr->e_phoff) + i * rdHalf32(le, ehdr->e_phentsize), total_file_size);
 	}
-
+        if (is32bit_p) *is32bit_p = true;
+        if (entry) *entry = (uint64_t) ehdr->e_entry;
 	return;
     } else if (hdr->e_ident[EI_CLASS] == ELFCLASS64) {
         if (total_file_size < sizeof(Elf64_Ehdr)) {
@@ -352,7 +353,8 @@ void loadELFHdr(const char* buffer, const int total_file_size) {
 	for(int i = 0; i < rdHalf64(le, ehdr->e_phnum); ++i) {
 	  loadProgHdr64(le, buffer, rdOff64(le, ehdr->e_phoff) + i * rdHalf64(le, ehdr->e_phentsize), total_file_size);
 	}
-
+        if (is32bit_p) *is32bit_p = false;
+        if (entry) *entry = ehdr->e_entry;
 	return;
     } else {
         fprintf(stderr, "Unrecognized ELF file format\n");
@@ -360,7 +362,7 @@ void loadELFHdr(const char* buffer, const int total_file_size) {
     }
 }
 
-void load_elf(char *filename) {
+void load_elf(char *filename, bool *is32bit_p, uint64_t *entry) {
     // Read input file into memory
     char* buffer = NULL;
     int   size   = 0;
@@ -377,8 +379,7 @@ void load_elf(char *filename) {
         if (s < 0) { goto fail; }
         read += s;
     }
-
-    loadELFHdr(buffer, read);
+    loadELFHdr(buffer, read, is32bit_p, entry);
     free(buffer);
     return;
 
diff --git a/lib/elf.h b/lib/elf.h
index e5f90365..8ce99dbb 100644
--- a/lib/elf.h
+++ b/lib/elf.h
@@ -1,5 +1,7 @@
 #pragma once
 
 #include<string.h>
+#include<stdbool.h>
+#include<stdint.h>
 
-void load_elf(char *filename);
+void load_elf(char *filename, bool *is32bit_p, uint64_t *entry);
diff --git a/lib/rts.c b/lib/rts.c
index 1be10137..6bd97934 100644
--- a/lib/rts.c
+++ b/lib/rts.c
@@ -520,7 +520,7 @@ int process_arguments(int argc, char *argv[])
       break;
 
     case 'e':
-      load_elf(optarg);
+      load_elf(optarg, NULL, NULL);
       break;
 
     case 'n':
-- 
cgit v1.2.3