From 3e47ab23427135cef00e718ae10f2b6338c4ae64 Mon Sep 17 00:00:00 2001
From: sewardj <unknown>
Date: Fri, 17 Dec 1999 16:34:08 +0000
Subject: [PATCH] [project @ 1999-12-17 16:34:08 by sewardj] Reorganised object
code loader/linker to make it much more modular and cleaner. All the
machinery is now in object.[ch]. This stuff is packaged up as close to a
standalone library as I can reasonably get it -- in particular, it knows
nothing about Hugs -- so that the linker could easily be used in some
entirely different application with almost no changes, if we so desire.
Minor mods to interface.c & storage.c to use the new linker API.
---
ghc/interpreter/Makefile | 4 +-
ghc/interpreter/interface.c | 474 +++----------------------
ghc/interpreter/object.c | 679 ++++++++++++++++++++++++++++++++++++
ghc/interpreter/object.h | 115 ++++++
ghc/interpreter/storage.c | 104 +-----
ghc/interpreter/storage.h | 46 +--
6 files changed, 867 insertions(+), 555 deletions(-)
create mode 100644 ghc/interpreter/object.c
create mode 100644 ghc/interpreter/object.h
diff --git a/ghc/interpreter/Makefile b/ghc/interpreter/Makefile
index 0720cac78269..1fbc5c4b10d0 100644
--- a/ghc/interpreter/Makefile
+++ b/ghc/interpreter/Makefile
@@ -1,6 +1,6 @@
# --------------------------------------------------------------------------- #
-# $Id: Makefile,v 1.22 1999/11/24 10:12:47 andy Exp $ #
+# $Id: Makefile,v 1.23 1999/12/17 16:34:08 sewardj Exp $ #
# --------------------------------------------------------------------------- #
TOP = ..
@@ -36,7 +36,7 @@ HS_SRCS =
Y_SRCS = parser.y
C_SRCS = link.c type.c static.c storage.c derive.c input.c compiler.c subst.c \
translate.c codegen.c lift.c free.c stgSubst.c output.c \
- hugs.c dynamic.c stg.c sainteger.c interface.c
+ hugs.c dynamic.c stg.c sainteger.c object.c interface.c
SRC_CC_OPTS = -g -O -I$(GHC_INTERPRETER_DIR) -I$(GHC_INCLUDE_DIR) -I$(GHC_RUNTIME_DIR) -D__HUGS__ -DCOMPILING_RTS -Wall -Wstrict-prototypes -Wno-unused -DDEBUG -Winline
diff --git a/ghc/interpreter/interface.c b/ghc/interpreter/interface.c
index ea15926ae579..1a1b52652c87 100644
--- a/ghc/interpreter/interface.c
+++ b/ghc/interpreter/interface.c
@@ -7,24 +7,10 @@
* Hugs version 1.4, December 1997
*
* $RCSfile: interface.c,v $
- * $Revision: 1.12 $
- * $Date: 1999/12/16 16:42:56 $
+ * $Revision: 1.13 $
+ * $Date: 1999/12/17 16:34:08 $
* ------------------------------------------------------------------------*/
-/* ToDo:
- * o use Z encoding
- * o use vectored CONSTR_entry when appropriate
- * o generate export list
- *
- * Needs GHC changes to generate member selectors,
- * superclass selectors, etc
- * o instance decls
- * o dictionary constructors ?
- *
- * o Get Hugs/GHC to agree on what interface files look like.
- * o figure out how to replace the Hugs Prelude with the GHC Prelude
- */
-
#include "prelude.h"
#include "storage.h"
#include "backend.h"
@@ -32,7 +18,8 @@
#include "errors.h"
#include "link.h"
#include "Assembler.h" /* for wrapping GHC objects */
-#include "dynamic.h"
+#include "object.h"
+
#define DEBUG_IFACE
#define VERBOSE FALSE
@@ -179,10 +166,6 @@ static List ifTyvarsIn Args((Type));
static Type tvsToOffsets Args((Int,Type,List));
static Type conidcellsToTycons Args((Int,Type));
-static Void resolveReferencesInObjectModule Args((Module,Bool));
-static Bool validateOImage Args((void*, Int, Bool));
-static Void readSyms Args((Module,Bool));
-
static void* lookupObjName ( char* );
@@ -967,12 +950,20 @@ printf("\n");
* Modules
* ------------------------------------------------------------------------*/
-Void startGHCModule ( Text mname, Int sizeObj, Text nameObj )
+void startGHCModule_errMsg ( char* msg )
+{
+ fprintf ( stderr, "object error: %s\n", msg );
+}
+
+void* startGHCModule_clientLookup ( char* sym )
{
- FILE* f;
- void* img;
+ return lookupObjName ( sym );
+}
+Void startGHCModule ( Text mname, Int sizeObj, Text nameObj )
+{
Module m = findModule(mname);
+
if (isNull(m)) {
m = newModule(mname);
fprintf ( stderr, "startGHCIface: name %16s objsize %d\n",
@@ -986,37 +977,29 @@ Void startGHCModule ( Text mname, Int sizeObj, Text nameObj )
}
}
- img = malloc ( sizeObj );
- if (!img) {
- ERRMSG(0) "Can't allocate memory to load object file for module \"%s\"",
+ module(m).object
+ = ocNew ( startGHCModule_errMsg,
+ startGHCModule_clientLookup,
+ textToStr(nameObj),
+ sizeObj );
+
+ if (!module(m).object) {
+ ERRMSG(0) "Object loading failed for module \"%s\"",
textToStr(mname)
EEND;
}
- f = fopen( textToStr(nameObj), "rb" );
- if (!f) {
- /* Really, this shouldn't happen, since makeStackEntry ensures the
- object is available. Nevertheless ...
- */
- ERRMSG(0) "Object file \"%s\" can't be opened to read -- oops!",
- &(textToStr(nameObj)[0])
- EEND;
- }
- if (sizeObj != fread ( img, 1, sizeObj, f)) {
- ERRMSG(0) "Read of object file \"%s\" failed", textToStr(nameObj)
- EEND;
- }
- if (!validateOImage(img,sizeObj,VERBOSE)) {
+
+ if (!ocVerifyImage(module(m).object,VERBOSE)) {
ERRMSG(0) "Validation of object file \"%s\" failed",
textToStr(nameObj)
EEND;
}
-
- assert(!module(m).oImage);
- module(m).oImage = img;
- readSyms(m,VERBOSE);
-
- /* setCurrModule(m); */
+ if (!ocGetNames(module(m).object,VERBOSE)) {
+ ERRMSG(0) "Reading of symbol names in object file \"%s\" failed",
+ textToStr(nameObj)
+ EEND;
+ }
}
@@ -1188,7 +1171,8 @@ Void finishGHCModule ( Cell root )
}
/* Last, but by no means least ... */
- resolveReferencesInObjectModule ( mod, VERBOSE );
+ if (!ocResolve(module(mod).object,VERBOSE))
+ internal("finishGHCModule: object resolution failed");
}
@@ -2147,383 +2131,6 @@ Type type; {
}
-/* --------------------------------------------------------------------------
- * ELF specifics
- * ------------------------------------------------------------------------*/
-
-#if defined(linux_TARGET_OS) || defined(solaris2_TARGET_OS)
-
-#include <elf.h>
-
-static char* findElfSection ( void* objImage, Elf32_Word sh_type )
-{
- Int i;
- char* ehdrC = (char*)objImage;
- Elf32_Ehdr* ehdr = ( Elf32_Ehdr*)ehdrC;
- Elf32_Shdr* shdr = (Elf32_Shdr*) (ehdrC + ehdr->e_shoff);
- char* ptr = NULL;
- for (i = 0; i < ehdr->e_shnum; i++) {
- if (shdr[i].sh_type == sh_type &&
- i != ehdr->e_shstrndx) {
- ptr = ehdrC + shdr[i].sh_offset;
- break;
- }
- }
- return ptr;
-}
-
-
-static Void resolveReferencesInObjectModule_elf ( Module m,
- Bool verb )
-{
- char symbol[1000]; // ToDo
- int i, j;
- Elf32_Sym* stab = NULL;
- char* strtab;
- char* ehdrC = (char*)(module(m).oImage);
- Elf32_Ehdr* ehdr = (Elf32_Ehdr*) ehdrC;
- Elf32_Shdr* shdr = (Elf32_Shdr*) (ehdrC + ehdr->e_shoff);
- Elf32_Word* targ;
- // first find "the" symbol table
- // why is this commented out???
- stab = (Elf32_Sym*) findElfSection ( ehdrC, SHT_SYMTAB );
-
- // also go find the string table
- strtab = findElfSection ( ehdrC, SHT_STRTAB );
-
- if (!stab || !strtab)
- internal("resolveReferencesInObjectModule_elf");
-
- for (i = 0; i < ehdr->e_shnum; i++) {
- if (shdr[i].sh_type == SHT_REL ) {
- Elf32_Rel* rtab = (Elf32_Rel*) (ehdrC + shdr[i].sh_offset);
- Int nent = shdr[i].sh_size / sizeof(Elf32_Rel);
- Int target_shndx = shdr[i].sh_info;
- Int symtab_shndx = shdr[i].sh_link;
- stab = (Elf32_Sym*) (ehdrC + shdr[ symtab_shndx ].sh_offset);
- targ = (Elf32_Word*)(ehdrC + shdr[ target_shndx ].sh_offset);
- if (verb)
- fprintf ( stderr,
- "relocations for section %d using symtab %d\n",
- target_shndx, symtab_shndx );
- for (j = 0; j < nent; j++) {
- Elf32_Addr offset = rtab[j].r_offset;
- Elf32_Word info = rtab[j].r_info;
-
- Elf32_Addr P = ((Elf32_Addr)targ) + offset;
- Elf32_Word* pP = (Elf32_Word*)P;
- Elf32_Addr A = *pP;
- Elf32_Addr S;
-
- if (verb) fprintf ( stderr, "Rel entry %3d is raw(%6p %6p) ",
- j, (void*)offset, (void*)info );
- if (!info) {
- if (verb) fprintf ( stderr, " ZERO\n" );
- S = 0;
- } else {
- if (stab[ ELF32_R_SYM(info)].st_name == 0) {
- if (verb) fprintf ( stderr, "(noname) ");
- /* nameless (local) symbol */
- S = (Elf32_Addr)(ehdrC
- + shdr[stab[ELF32_R_SYM(info)].st_shndx ].sh_offset
- + stab[ELF32_R_SYM(info)].st_value
- );
- strcpy ( symbol, "(noname)");
- } else {
- strcpy ( symbol, strtab+stab[ ELF32_R_SYM(info)].st_name );
- if (verb) fprintf ( stderr, "`%s' ", symbol );
- S = (Elf32_Addr)lookupObjName ( symbol );
- }
- if (verb) fprintf ( stderr, "resolves to %p\n", (void*)S );
- if (!S) {
- fprintf ( stderr, "link failure for `%s'\n",
- strtab+stab[ ELF32_R_SYM(info)].st_name );
- assert(0);
- }
- }
- //fprintf ( stderr, "Reloc: P = %p S = %p A = %p\n\n",
- // (void*)P, (void*)S, (void*)A );
- switch (ELF32_R_TYPE(info)) {
- case R_386_32: *pP = S + A; break;
- case R_386_PC32: *pP = S + A - P; break;
- default: fprintf(stderr,
- "unhandled ELF relocation type %d\n",
- ELF32_R_TYPE(info));
- assert(0);
- }
-
- }
- }
- else
- if (shdr[i].sh_type == SHT_RELA) {
- fprintf ( stderr, "RelA style reloc table -- not yet done" );
- assert(0);
- }
- }
-}
-
-
-static Bool validateOImage_elf ( void* imgV,
- Int size,
- Bool verb )
-{
- Elf32_Shdr* shdr;
- Elf32_Sym* stab;
- int i, j, nent, nstrtab, nsymtabs;
- char* sh_strtab;
- char* strtab;
-
- char* ehdrC = (char*)imgV;
- Elf32_Ehdr* ehdr = ( Elf32_Ehdr*)ehdrC;
-
- if (ehdr->e_ident[EI_MAG0] != ELFMAG0 ||
- ehdr->e_ident[EI_MAG1] != ELFMAG1 ||
- ehdr->e_ident[EI_MAG2] != ELFMAG2 ||
- ehdr->e_ident[EI_MAG3] != ELFMAG3) {
- if (verb) fprintf ( stderr, "Not an ELF header\n" );
- return FALSE;
- }
- if (verb) fprintf ( stderr, "Is an ELF header\n" );
-
- if (ehdr->e_ident[EI_CLASS] != ELFCLASS32) {
- if (verb) fprintf ( stderr, "Not 32 bit ELF\n" );
- return FALSE;
- }
- if (verb) fprintf ( stderr, "Is 32 bit ELF\n" );
-
- if (ehdr->e_ident[EI_DATA] == ELFDATA2LSB) {
- if (verb) fprintf ( stderr, "Is little-endian\n" );
- } else
- if (ehdr->e_ident[EI_DATA] == ELFDATA2MSB) {
- if (verb) fprintf ( stderr, "Is big-endian\n" );
- } else {
- if (verb) fprintf ( stderr, "Unknown endiannness\n" );
- return FALSE;
- }
-
- if (ehdr->e_type != ET_REL) {
- if (verb) fprintf ( stderr, "Not a relocatable object (.o) file\n" );
- return FALSE;
- }
- if (verb) fprintf ( stderr, "Is a relocatable object (.o) file\n" );
-
- if (verb) fprintf ( stderr, "Architecture is " );
- switch (ehdr->e_machine) {
- case EM_386: if (verb) fprintf ( stderr, "x86\n" ); break;
- case EM_SPARC: if (verb) fprintf ( stderr, "sparc\n" ); break;
- default: if (verb) fprintf ( stderr, "unknown\n" ); return FALSE;
- }
-
- if (verb)
- fprintf ( stderr,
- "\nSection header table: start %d, n_entries %d, ent_size %d\n",
- ehdr->e_shoff, ehdr->e_shnum, ehdr->e_shentsize );
-
- assert (ehdr->e_shentsize == sizeof(Elf32_Shdr));
-
- shdr = (Elf32_Shdr*) (ehdrC + ehdr->e_shoff);
-
- if (ehdr->e_shstrndx == SHN_UNDEF) {
- if (verb) fprintf ( stderr, "No section header string table\n" );
- sh_strtab = NULL;
- return FALSE;
- } else {
- if (verb) fprintf ( stderr,"Section header string table is section %d\n",
- ehdr->e_shstrndx);
- sh_strtab = ehdrC + shdr[ehdr->e_shstrndx].sh_offset;
- }
-
- for (i = 0; i < ehdr->e_shnum; i++) {
- if (verb) fprintf ( stderr, "%2d: ", i );
- if (verb) fprintf ( stderr, "type=%2d ", shdr[i].sh_type );
- if (verb) fprintf ( stderr, "size=%4d ", shdr[i].sh_size );
- if (verb) fprintf ( stderr, "offs=%4d ", shdr[i].sh_offset );
- if (verb) fprintf ( stderr, " (%p .. %p) ",
- ehdrC + shdr[i].sh_offset,
- ehdrC + shdr[i].sh_offset + shdr[i].sh_size - 1);
-
- if (shdr[i].sh_type == SHT_REL && verb) fprintf ( stderr, "Rel " ); else
- if (shdr[i].sh_type == SHT_RELA && verb) fprintf ( stderr, "RelA " ); else
- if (verb) fprintf ( stderr, " " );
- if (sh_strtab && verb)
- fprintf ( stderr, "sname=%s", sh_strtab + shdr[i].sh_name );
- if (verb) fprintf ( stderr, "\n" );
- }
-
- if (verb) fprintf ( stderr, "\n\nString tables\n" );
- strtab = NULL;
- nstrtab = 0;
- for (i = 0; i < ehdr->e_shnum; i++) {
- if (shdr[i].sh_type == SHT_STRTAB &&
- i != ehdr->e_shstrndx) {
- if (verb)
- fprintf ( stderr, " section %d is a normal string table\n", i );
- strtab = ehdrC + shdr[i].sh_offset;
- nstrtab++;
- }
- }
- if (nstrtab != 1) {
- if (verb) fprintf ( stderr, "WARNING: no string tables, or too many\n" );
- return FALSE;
- }
-
- nsymtabs = 0;
- if (verb) fprintf ( stderr, "\n\nSymbol tables\n" );
- for (i = 0; i < ehdr->e_shnum; i++) {
- if (shdr[i].sh_type != SHT_SYMTAB) continue;
- if (verb) fprintf ( stderr, "section %d is a symbol table\n", i );
- nsymtabs++;
- stab = (Elf32_Sym*) (ehdrC + shdr[i].sh_offset);
- nent = shdr[i].sh_size / sizeof(Elf32_Sym);
- if (verb) fprintf ( stderr, " number of entries is apparently %d (%d rem)\n",
- nent,
- shdr[i].sh_size % sizeof(Elf32_Sym)
- );
- if (0 != shdr[i].sh_size % sizeof(Elf32_Sym)) {
- if (verb) fprintf ( stderr, "non-integral number of symbol table entries\n");
- return FALSE;
- }
- for (j = 0; j < nent; j++) {
- if (verb) fprintf ( stderr, " %2d ", j );
- if (verb) fprintf ( stderr, " sec=%-5d size=%-3d val=%-5p ",
- (int)stab[j].st_shndx,
- (int)stab[j].st_size,
- (char*)stab[j].st_value );
-
- if (verb) fprintf ( stderr, "type=" );
- switch (ELF32_ST_TYPE(stab[j].st_info)) {
- case STT_NOTYPE: if (verb) fprintf ( stderr, "notype " ); break;
- case STT_OBJECT: if (verb) fprintf ( stderr, "object " ); break;
- case STT_FUNC : if (verb) fprintf ( stderr, "func " ); break;
- case STT_SECTION: if (verb) fprintf ( stderr, "section" ); break;
- case STT_FILE: if (verb) fprintf ( stderr, "file " ); break;
- default: if (verb) fprintf ( stderr, "? " ); break;
- }
- if (verb) fprintf ( stderr, " " );
-
- if (verb) fprintf ( stderr, "bind=" );
- switch (ELF32_ST_BIND(stab[j].st_info)) {
- case STB_LOCAL : if (verb) fprintf ( stderr, "local " ); break;
- case STB_GLOBAL: if (verb) fprintf ( stderr, "global" ); break;
- case STB_WEAK : if (verb) fprintf ( stderr, "weak " ); break;
- default: if (verb) fprintf ( stderr, "? " ); break;
- }
- if (verb) fprintf ( stderr, " " );
-
- if (verb) fprintf ( stderr, "name=%s\n", strtab + stab[j].st_name );
- }
- }
-
- if (nsymtabs == 0) {
- if (verb) fprintf ( stderr, "Didn't find any symbol tables\n" );
- return FALSE;
- }
-
- return TRUE;
-}
-
-
-static void readSyms_elf ( Module m, Bool verb )
-{
- int i, j, k, nent;
- Elf32_Sym* stab;
-
- char* ehdrC = (char*)(module(m).oImage);
- Elf32_Ehdr* ehdr = (Elf32_Ehdr*)ehdrC;
- char* strtab = findElfSection ( ehdrC, SHT_STRTAB );
- Elf32_Shdr* shdr = (Elf32_Shdr*) (ehdrC + ehdr->e_shoff);
- char* sh_strtab = ehdrC + shdr[ehdr->e_shstrndx].sh_offset;
-
- if (!strtab) internal("readSyms_elf");
-
- k = 0;
- for (i = 0; i < ehdr->e_shnum; i++) {
-
- /* make a HugsDLSection entry for relevant sections */
- DLSect kind = HUGS_DL_SECTION_OTHER;
- if (0==strcmp(".data",sh_strtab+shdr[i].sh_name) ||
- 0==strcmp(".data1",sh_strtab+shdr[i].sh_name))
- kind = HUGS_DL_SECTION_RWDATA;
- if (0==strcmp(".text",sh_strtab+shdr[i].sh_name) ||
- 0==strcmp(".rodata",sh_strtab+shdr[i].sh_name) ||
- 0==strcmp(".rodata1",sh_strtab+shdr[i].sh_name))
- kind = HUGS_DL_SECTION_CODE_OR_RODATA;
- if (kind != HUGS_DL_SECTION_OTHER)
- addDLSect (
- m,
- ehdrC + shdr[i].sh_offset,
- ehdrC + shdr[i].sh_offset + shdr[i].sh_size - 1,
- kind
- );
-
- if (shdr[i].sh_type != SHT_SYMTAB) continue;
-
- /* copy stuff into this module's object symbol table */
- stab = (Elf32_Sym*) (ehdrC + shdr[i].sh_offset);
- nent = shdr[i].sh_size / sizeof(Elf32_Sym);
- for (j = 0; j < nent; j++) {
- if ( ( ELF32_ST_BIND(stab[j].st_info)==STB_GLOBAL ||
- ELF32_ST_BIND(stab[j].st_info)==STB_LOCAL
- )
- &&
- ( ELF32_ST_TYPE(stab[j].st_info)==STT_FUNC ||
- ELF32_ST_TYPE(stab[j].st_info)==STT_OBJECT ||
- ELF32_ST_TYPE(stab[j].st_info)==STT_NOTYPE)
- ) {
- char* nm = strtab + stab[j].st_name;
- char* ad = ehdrC
- + shdr[ stab[j].st_shndx ].sh_offset
- + stab[j].st_value;
- assert(nm);
- assert(ad);
- if (verb)
- fprintf(stderr, "addOTabName: %10p %s %s\n",
- ad, textToStr(module(m).text), nm );
- addOTabName ( m, nm, ad );
- }
- //else fprintf(stderr, "skipping `%s'\n", strtab + stab[j].st_name );
- }
-
- }
-}
-
-#endif /* defined(linux_TARGET_OS) || defined(solaris2_TARGET_OS) */
-
-
-/* --------------------------------------------------------------------------
- * Arch-independent interface to the runtime linker
- * ------------------------------------------------------------------------*/
-
-static Bool validateOImage ( void* img, Int size, Bool verb )
-{
-#if defined(linux_TARGET_OS) || defined(solaris2_TARGET_OS)
- return
- validateOImage_elf ( img, size, verb );
-#else
- internal("validateOImage: not implemented on this platform");
-#endif
-}
-
-
-static Void resolveReferencesInObjectModule ( Module m, Bool verb )
-{
-#if defined(linux_TARGET_OS) || defined(solaris2_TARGET_OS)
- resolveReferencesInObjectModule_elf ( m, verb );
-#else
- internal("resolveReferencesInObjectModule: not implemented on this platform");
-#endif
-}
-
-
-static Void readSyms ( Module m, Bool verb )
-{
-#if defined(linux_TARGET_OS) || defined(solaris2_TARGET_OS)
- readSyms_elf ( m, verb );
-#else
- internal("readSyms: not implemented on this platform");
-#endif
-}
-
/* --------------------------------------------------------------------------
* General object symbol query stuff
@@ -2583,7 +2190,7 @@ void* lookupObjName ( char* nm )
m = findModule(t);
if (isNull(m)) goto not_found;
fprintf(stderr, " %%%% %s\n", nm );
- a = lookupOTabName ( m, nm );
+ a = lookupOTabName ( m, nm ); /* RATIONALISE */
if (a) return a;
not_found:
@@ -2596,22 +2203,25 @@ fprintf(stderr, " %%%% %s\n", nm );
int is_dynamically_loaded_code_or_rodata_ptr ( char* p )
{
- return
- lookupDLSect(p) == HUGS_DL_SECTION_CODE_OR_RODATA;
+ OSectionKind sk = lookupSection(p);
+ assert (sk != HUGS_SECTIONKIND_NOINFOAVAIL);
+ return (sk == HUGS_SECTIONKIND_CODE_OR_RODATA);
}
int is_dynamically_loaded_rwdata_ptr ( char* p )
{
- return
- lookupDLSect(p) == HUGS_DL_SECTION_RWDATA;
+ OSectionKind sk = lookupSection(p);
+ assert (sk != HUGS_SECTIONKIND_NOINFOAVAIL);
+ return (sk == HUGS_SECTIONKIND_RWDATA);
}
int is_not_dynamically_loaded_ptr ( char* p )
{
- return
- lookupDLSect(p) == HUGS_DL_SECTION_OTHER;
+ OSectionKind sk = lookupSection(p);
+ assert (sk != HUGS_SECTIONKIND_NOINFOAVAIL);
+ return (sk == HUGS_SECTIONKIND_OTHER);
}
diff --git a/ghc/interpreter/object.c b/ghc/interpreter/object.c
new file mode 100644
index 000000000000..f3426d6911ca
--- /dev/null
+++ b/ghc/interpreter/object.c
@@ -0,0 +1,679 @@
+
+/* --------------------------------------------------------------------------
+ * Machinery for dynamic loading and linking of object code. Should be
+ * completely independent from the rest of Hugs so we can use it in
+ * other applications if desired.
+ *
+ * The Hugs 98 system is Copyright (c) Mark P Jones, Alastair Reid, the
+ * Yale Haskell Group, and the Oregon Graduate Institute of Science and
+ * Technology, 1994-1999, All rights reserved. It is distributed as
+ * free software under the license in the file "License", which is
+ * included in the distribution.
+ *
+ * ------------------------------------------------------------------------*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include "object.h"
+
+
+#if defined(linux_TARGET_OS) || defined(solaris2_TARGET_OS)
+static int ocVerifyImage_ELF ( ObjectCode* oc, int verb );
+static int ocGetNames_ELF ( ObjectCode* oc, int verb );
+static int ocResolve_ELF ( ObjectCode* oc, int verb );
+#endif
+
+static char* hackyAppend ( char* s1, char* s2 );
+
+
+/* --------------------------------------------------------------------------
+ * Arch-independent interface to the runtime linker
+ * ------------------------------------------------------------------------*/
+
+ObjectCode* ocNew ( void (*errMsg)(char*),
+ void* (*clientLookup)(char*),
+ char* objFileName,
+ int objFileSize )
+{
+ ObjectCode* oc = malloc(sizeof(ObjectCode));
+ if (!oc) {
+ errMsg("ocNew: can't allocate memory for object code record");
+ return NULL;
+ }
+
+# if defined(linux_TARGET_OS) || defined(solaris2_TARGET_OS)
+ oc->formatName = "ELF";
+# else
+ free(oc);
+ errMsg("ocNew: not implemented on this platform");
+ return NULL;
+# endif
+
+ oc->status = OBJECT_NOTINUSE;
+ oc->objFileName = objFileName;
+ oc->objFileSize = objFileSize;
+ oc->errMsg = errMsg;
+ oc->clientLookup = clientLookup;
+
+ oc->oImage = malloc ( objFileSize );
+ if (!oc->oImage) {
+ free(oc);
+ errMsg("ocNew: can't allocate memory for object code");
+ return NULL;
+ }
+ oc->oTab = NULL;
+ oc->sizeoTab = 0;
+ oc->usedoTab = 0;
+ oc->sectionTab = NULL;
+ oc->sizesectionTab = 0;
+ oc->usedsectionTab = 0;
+ oc->next = NULL;
+
+ return oc;
+}
+
+
+int ocLoadImage ( ObjectCode* oc, int verb )
+{
+ int n;
+ FILE* f;
+ assert (oc && oc->status==OBJECT_NOTINUSE);
+ if (verb) fprintf(stderr, "ocLoadImage %s\n", oc->objFileName );
+ f = fopen(oc->objFileName, "rb");
+ if (!f) {
+ (oc->errMsg(hackyAppend("ocLoadImage: can't read: ",
+ oc->objFileName)));
+ return 0;
+ }
+ n = fread ( oc->oImage, 1, oc->objFileSize, f );
+ if (n != oc->objFileSize) {
+ fclose(f);
+ oc->errMsg(hackyAppend("ocLoadImage: I/O error whilst reading: ",
+ oc->objFileName));
+ return 0;
+ }
+ oc->status = OBJECT_OIMAGE;
+ if (verb) fprintf(stderr, "ocLoadImage %s: read %d bytes\n",
+ oc->objFileName, oc->objFileSize );
+ return 1;
+}
+
+
+/* returns 1 if ok, 0 if error */
+int ocVerifyImage ( ObjectCode* oc, int verb )
+{
+ int ret;
+ assert (oc && oc->status==OBJECT_OIMAGE);
+ if (verb) fprintf(stderr, "ocVerifyImage: begin\n");
+# if defined(linux_TARGET_OS) || defined(solaris2_TARGET_OS)
+ ret = ocVerifyImage_ELF ( oc, verb );
+# else
+ oc->errMsg("ocVerifyImage: not implemented on this platform");
+ return 0;
+# endif
+ if (verb) fprintf(stderr, "ocVerifyImage: done, status = %d", ret);
+
+ if (ret) oc->status==OBJECT_VERIFIED;
+ return ret;
+}
+
+
+/* returns 1 if ok, 0 if error */
+int ocGetNames ( ObjectCode* oc, int verb )
+{
+ int ret;
+ assert (oc && oc->status==OBJECT_VERIFIED);
+ if (verb) fprintf(stderr, "ocGetNames: begin\n");
+# if defined(linux_TARGET_OS) || defined(solaris2_TARGET_OS)
+ ret = ocGetNames_ELF ( oc, verb );
+# else
+ oc->errMsg("ocGetNames: not implemented on this platform");
+ return 0;
+# endif
+ if (verb) fprintf(stderr, "ocGetNames: done, status = %d\n", ret);
+ if (ret) oc->status==OBJECT_HAVENAMES;
+ return ret;
+}
+
+
+/* returns 1 if ok, 0 if error */
+int ocResolve ( ObjectCode* oc, int verb )
+{
+ int ret;
+ assert (oc && oc->status==OBJECT_HAVENAMES);
+ if (verb) fprintf(stderr, "ocResolve: begin\n");
+# if defined(linux_TARGET_OS) || defined(solaris2_TARGET_OS)
+ ret = ocResolve_ELF ( oc, verb );
+# else
+ oc->errMsg("ocResolve: not implemented on this platform");
+ return 0;
+# endif
+ if (verb) fprintf(stderr, "ocResolve: done, status = %d\n", ret);
+ if (ret) oc->status==OBJECT_RESOLVED;
+ return ret;
+}
+
+
+void ocFree ( ObjectCode* oc )
+{
+ if (oc) {
+ if (oc->oImage) free(oc->oImage);
+ if (oc->oTab) free(oc->oTab);
+ if (oc->sectionTab) free(oc->sectionTab);
+ free(oc);
+ }
+}
+
+
+/* --------------------------------------------------------------------------
+ * Simple, dynamically expandable association tables
+ * ------------------------------------------------------------------------*/
+
+/* A bit tricky. Assumes that if tab==NULL, then
+ currUsed and *currSize must be zero.
+ Returns NULL if expansion failed.
+*/
+static void* genericExpand ( void* tab,
+ int* currSize, int currUsed,
+ int initSize, int elemSize )
+{
+ int size2;
+ void* tab2;
+ if (currUsed < *currSize) return tab;
+ size2 = (*currSize == 0) ? initSize : (2 * *currSize);
+ tab2 = malloc ( size2 * elemSize );
+ if (!tab2) return NULL;
+ if (*currSize > 0)
+ memcpy ( tab2, tab, elemSize * *currSize );
+ *currSize = size2;
+ if (tab) free ( tab );
+ return tab2;
+}
+
+
+/* returns 1 if success, 0 if error */
+static int addSymbol ( ObjectCode* oc, char* nm, void* ad )
+{
+ OSym* newTab
+ = genericExpand ( oc->oTab,
+ &(oc->sizeoTab),
+ oc->usedoTab,
+ 8, sizeof(OSym) );
+
+ if (!newTab) {
+ oc->errMsg("addSymbol: malloc failed whilst expanding table");
+ return 0;
+ }
+ oc->oTab = newTab;
+ oc->oTab[ oc->usedoTab ].nm = nm;
+ oc->oTab[ oc->usedoTab ].ad = ad;
+ oc->usedoTab++;
+ return 1;
+}
+
+
+/* returns 1 if success, 0 if error */
+static int addSection ( ObjectCode* oc, void* start, void* end, OSectionKind sect )
+{
+ OSection* newTab
+ = genericExpand ( oc->sectionTab,
+ &(oc->sizesectionTab),
+ oc->usedsectionTab,
+ 4, sizeof(OSection) );
+ if (!newTab) {
+ oc->errMsg("addSection: malloc failed whilst expanding table");
+ return 0;
+ }
+ oc->sectionTab = newTab;
+ oc->sectionTab[ oc->usedsectionTab ].start = start;
+ oc->sectionTab[ oc->usedsectionTab ].end = end;
+ oc->sectionTab[ oc->usedsectionTab ].kind = sect;
+ oc->usedsectionTab++;
+ return 1;
+}
+
+
+void* ocLookupSym ( ObjectCode* oc, char* sym )
+{
+ int i;
+
+ assert(oc);
+ if (oc->status != OBJECT_HAVENAMES
+ && oc->status != OBJECT_RESOLVED) {
+ oc->errMsg("ocLookupSym: no symbols available");
+ return NULL;
+ }
+
+ for (i = 0; i < oc->usedoTab; i++) {
+ if (0)
+ fprintf ( stderr,
+ "ocLookupSym: request %s, table has %s\n",
+ sym, oc->oTab[i].nm );
+ if (0==strcmp(sym,oc->oTab[i].nm))
+ return oc->oTab[i].ad;
+ }
+ return NULL;
+}
+
+
+char* ocLookupAddr ( ObjectCode* oc, void* addr )
+{
+ int i;
+
+ assert(oc);
+ if (oc->status != OBJECT_HAVENAMES
+ && oc->status != OBJECT_RESOLVED) {
+ oc->errMsg("ocLookupAddr: no symbols available");
+ return NULL;
+ }
+
+ for (i = 0; i < oc->usedoTab; i++) {
+ if (addr == oc->oTab[i].ad)
+ return oc->oTab[i].nm;
+ }
+ return NULL;
+}
+
+
+OSectionKind ocLookupSection ( ObjectCode* oc, void* addr )
+{
+ int i;
+
+ assert(oc);
+ if (oc->status != OBJECT_HAVENAMES
+ && oc->status != OBJECT_RESOLVED) {
+ oc->errMsg("ocLookupSection: no symbols available");
+ return HUGS_SECTIONKIND_NOINFOAVAIL;
+ }
+
+
+ for (i = 0; i < oc->usedsectionTab; i++) {
+ if (oc->sectionTab[i].start <= addr
+ && addr <= oc->sectionTab[i].end)
+ return oc->sectionTab[i].kind;
+ }
+
+ return HUGS_SECTIONKIND_NOINFOAVAIL;
+}
+
+
+/* Ghastly append which leaks space. But we only use it for
+ error messages -- that's my excuse.
+*/
+static char* hackyAppend ( char* s1, char* s2 )
+{
+ char* res = malloc ( 4 + strlen(s1) + strlen(s2) );
+ if (!res) {
+ fprintf ( stderr, "hugs: fatal: hackyAppend\n\t%s\n\t%s\n", s1, s2 );
+ assert(res);
+ }
+ strcpy(res,s1);
+ strcat(res,s2);
+ return res;
+}
+
+/* --------------------------------------------------------------------------
+ * ELF specifics
+ * ------------------------------------------------------------------------*/
+
+#if defined(linux_TARGET_OS) || defined(solaris2_TARGET_OS)
+
+#include <elf.h>
+
+static char* findElfSection ( void* objImage, Elf32_Word sh_type )
+{
+ Int i;
+ char* ehdrC = (char*)objImage;
+ Elf32_Ehdr* ehdr = ( Elf32_Ehdr*)ehdrC;
+ Elf32_Shdr* shdr = (Elf32_Shdr*) (ehdrC + ehdr->e_shoff);
+ char* ptr = NULL;
+ for (i = 0; i < ehdr->e_shnum; i++) {
+ if (shdr[i].sh_type == sh_type &&
+ i != ehdr->e_shstrndx) {
+ ptr = ehdrC + shdr[i].sh_offset;
+ break;
+ }
+ }
+ return ptr;
+}
+
+
+static int ocVerifyImage_ELF ( ObjectCode* oc, int verb )
+{
+ Elf32_Shdr* shdr;
+ Elf32_Sym* stab;
+ int i, j, nent, nstrtab, nsymtabs;
+ char* sh_strtab;
+ char* strtab;
+
+ char* ehdrC = (char*)(oc->oImage);
+ Elf32_Ehdr* ehdr = ( Elf32_Ehdr*)ehdrC;
+
+ if (ehdr->e_ident[EI_MAG0] != ELFMAG0 ||
+ ehdr->e_ident[EI_MAG1] != ELFMAG1 ||
+ ehdr->e_ident[EI_MAG2] != ELFMAG2 ||
+ ehdr->e_ident[EI_MAG3] != ELFMAG3) {
+ oc->errMsg("Not an ELF header");
+ return FALSE;
+ }
+ if (verb) fprintf ( stderr, "Is an ELF header\n" );
+
+ if (ehdr->e_ident[EI_CLASS] != ELFCLASS32) {
+ oc->errMsg("Not 32 bit ELF" );
+ return FALSE;
+ }
+ if (verb) fprintf ( stderr, "Is 32 bit ELF\n" );
+
+ if (ehdr->e_ident[EI_DATA] == ELFDATA2LSB) {
+ if (verb) fprintf ( stderr, "Is little-endian\n" );
+ } else
+ if (ehdr->e_ident[EI_DATA] == ELFDATA2MSB) {
+ if (verb) fprintf ( stderr, "Is big-endian\n" );
+ } else {
+ oc->errMsg("Unknown endiannness");
+ return FALSE;
+ }
+
+ if (ehdr->e_type != ET_REL) {
+ oc->errMsg("Not a relocatable object (.o) file");
+ return FALSE;
+ }
+ if (verb) fprintf ( stderr, "Is a relocatable object (.o) file\n" );
+
+ if (verb) fprintf ( stderr, "Architecture is " );
+ switch (ehdr->e_machine) {
+ case EM_386: if (verb) fprintf ( stderr, "x86\n" ); break;
+ case EM_SPARC: if (verb) fprintf ( stderr, "sparc\n" ); break;
+ default: if (verb) fprintf ( stderr, "unknown\n" );
+ oc->errMsg("Unknown architecture");
+ return FALSE;
+ }
+
+ if (verb)
+ fprintf ( stderr,
+ "\nSection header table: start %d, n_entries %d, ent_size %d\n",
+ ehdr->e_shoff, ehdr->e_shnum, ehdr->e_shentsize );
+
+ assert (ehdr->e_shentsize == sizeof(Elf32_Shdr));
+
+ shdr = (Elf32_Shdr*) (ehdrC + ehdr->e_shoff);
+
+ if (ehdr->e_shstrndx == SHN_UNDEF) {
+ oc->errMsg("No section header string table");
+ return FALSE;
+ } else {
+ if (verb) fprintf ( stderr,"Section header string table is section %d\n",
+ ehdr->e_shstrndx);
+ sh_strtab = ehdrC + shdr[ehdr->e_shstrndx].sh_offset;
+ }
+
+ for (i = 0; i < ehdr->e_shnum; i++) {
+ if (verb) fprintf ( stderr, "%2d: ", i );
+ if (verb) fprintf ( stderr, "type=%2d ", shdr[i].sh_type );
+ if (verb) fprintf ( stderr, "size=%4d ", shdr[i].sh_size );
+ if (verb) fprintf ( stderr, "offs=%4d ", shdr[i].sh_offset );
+ if (verb) fprintf ( stderr, " (%p .. %p) ",
+ ehdrC + shdr[i].sh_offset,
+ ehdrC + shdr[i].sh_offset + shdr[i].sh_size - 1);
+
+ if (shdr[i].sh_type == SHT_REL && verb) fprintf ( stderr, "Rel " ); else
+ if (shdr[i].sh_type == SHT_RELA && verb) fprintf ( stderr, "RelA " ); else
+ if (verb) fprintf ( stderr, " " );
+ if (sh_strtab && verb)
+ fprintf ( stderr, "sname=%s", sh_strtab + shdr[i].sh_name );
+ if (verb) fprintf ( stderr, "\n" );
+ }
+
+ if (verb) fprintf ( stderr, "\n\nString tables\n" );
+ strtab = NULL;
+ nstrtab = 0;
+ for (i = 0; i < ehdr->e_shnum; i++) {
+ if (shdr[i].sh_type == SHT_STRTAB &&
+ i != ehdr->e_shstrndx) {
+ if (verb)
+ fprintf ( stderr, " section %d is a normal string table\n", i );
+ strtab = ehdrC + shdr[i].sh_offset;
+ nstrtab++;
+ }
+ }
+ if (nstrtab != 1) {
+ oc->errMsg("WARNING: no string tables, or too many");
+ return FALSE;
+ }
+
+ nsymtabs = 0;
+ if (verb) fprintf ( stderr, "\n\nSymbol tables\n" );
+ for (i = 0; i < ehdr->e_shnum; i++) {
+ if (shdr[i].sh_type != SHT_SYMTAB) continue;
+ if (verb) fprintf ( stderr, "section %d is a symbol table\n", i );
+ nsymtabs++;
+ stab = (Elf32_Sym*) (ehdrC + shdr[i].sh_offset);
+ nent = shdr[i].sh_size / sizeof(Elf32_Sym);
+ if (verb) fprintf ( stderr, " number of entries is apparently %d (%d rem)\n",
+ nent,
+ shdr[i].sh_size % sizeof(Elf32_Sym)
+ );
+ if (0 != shdr[i].sh_size % sizeof(Elf32_Sym)) {
+ oc->errMsg("non-integral number of symbol table entries");
+ return FALSE;
+ }
+ for (j = 0; j < nent; j++) {
+ if (verb) fprintf ( stderr, " %2d ", j );
+ if (verb) fprintf ( stderr, " sec=%-5d size=%-3d val=%-5p ",
+ (int)stab[j].st_shndx,
+ (int)stab[j].st_size,
+ (char*)stab[j].st_value );
+
+ if (verb) fprintf ( stderr, "type=" );
+ switch (ELF32_ST_TYPE(stab[j].st_info)) {
+ case STT_NOTYPE: if (verb) fprintf ( stderr, "notype " ); break;
+ case STT_OBJECT: if (verb) fprintf ( stderr, "object " ); break;
+ case STT_FUNC : if (verb) fprintf ( stderr, "func " ); break;
+ case STT_SECTION: if (verb) fprintf ( stderr, "section" ); break;
+ case STT_FILE: if (verb) fprintf ( stderr, "file " ); break;
+ default: if (verb) fprintf ( stderr, "? " ); break;
+ }
+ if (verb) fprintf ( stderr, " " );
+
+ if (verb) fprintf ( stderr, "bind=" );
+ switch (ELF32_ST_BIND(stab[j].st_info)) {
+ case STB_LOCAL : if (verb) fprintf ( stderr, "local " ); break;
+ case STB_GLOBAL: if (verb) fprintf ( stderr, "global" ); break;
+ case STB_WEAK : if (verb) fprintf ( stderr, "weak " ); break;
+ default: if (verb) fprintf ( stderr, "? " ); break;
+ }
+ if (verb) fprintf ( stderr, " " );
+
+ if (verb) fprintf ( stderr, "name=%s\n", strtab + stab[j].st_name );
+ }
+ }
+
+ if (nsymtabs == 0) {
+ oc->errMsg("Didn't find any symbol tables");
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+
+static int ocGetNames_ELF ( ObjectCode* oc, int verb )
+{
+ int i, j, k, nent;
+ Elf32_Sym* stab;
+
+ char* ehdrC = (char*)(oc->oImage);
+ Elf32_Ehdr* ehdr = (Elf32_Ehdr*)ehdrC;
+ char* strtab = findElfSection ( ehdrC, SHT_STRTAB );
+ Elf32_Shdr* shdr = (Elf32_Shdr*) (ehdrC + ehdr->e_shoff);
+ char* sh_strtab = ehdrC + shdr[ehdr->e_shstrndx].sh_offset;
+
+ if (!strtab) {
+ oc->errMsg("no strtab!");
+ return FALSE;
+ }
+
+ k = 0;
+ for (i = 0; i < ehdr->e_shnum; i++) {
+
+ /* make a HugsDLSection entry for relevant sections */
+ DLSect kind = HUGS_DL_SECTION_OTHER;
+ if (0==strcmp(".data",sh_strtab+shdr[i].sh_name) ||
+ 0==strcmp(".data1",sh_strtab+shdr[i].sh_name))
+ kind = HUGS_DL_SECTION_RWDATA;
+ if (0==strcmp(".text",sh_strtab+shdr[i].sh_name) ||
+ 0==strcmp(".rodata",sh_strtab+shdr[i].sh_name) ||
+ 0==strcmp(".rodata1",sh_strtab+shdr[i].sh_name))
+ kind = HUGS_DL_SECTION_CODE_OR_RODATA;
+ if (kind != HUGS_DL_SECTION_OTHER)
+ addDLSect (
+ m,
+ ehdrC + shdr[i].sh_offset,
+ ehdrC + shdr[i].sh_offset + shdr[i].sh_size - 1,
+ kind
+ );
+
+ if (shdr[i].sh_type != SHT_SYMTAB) continue;
+
+ /* copy stuff into this module's object symbol table */
+ stab = (Elf32_Sym*) (ehdrC + shdr[i].sh_offset);
+ nent = shdr[i].sh_size / sizeof(Elf32_Sym);
+ for (j = 0; j < nent; j++) {
+ if ( ( ELF32_ST_BIND(stab[j].st_info)==STB_GLOBAL ||
+ ELF32_ST_BIND(stab[j].st_info)==STB_LOCAL
+ )
+ &&
+ ( ELF32_ST_TYPE(stab[j].st_info)==STT_FUNC ||
+ ELF32_ST_TYPE(stab[j].st_info)==STT_OBJECT ||
+ ELF32_ST_TYPE(stab[j].st_info)==STT_NOTYPE)
+ ) {
+ char* nm = strtab + stab[j].st_name;
+ char* ad = ehdrC
+ + shdr[ stab[j].st_shndx ].sh_offset
+ + stab[j].st_value;
+ assert(nm);
+ assert(ad);
+ if (verb)
+ fprintf(stderr, "addOTabName: %10p %s %s\n",
+ ad, textToStr(module(m).text), nm );
+ addSymbol ( oc, nm, ad );
+ }
+ //else fprintf(stderr, "skipping `%s'\n", strtab + stab[j].st_name );
+ }
+
+ }
+}
+
+
+static int ocResolve_ELF ( ObjectCode* oc, int verb )
+{
+ char symbol[1000]; // ToDo
+ char* strtab;
+ int i, j;
+ Elf32_Sym* stab = NULL;
+ char* ehdrC = (char*)(oc->oImage);
+ Elf32_Ehdr* ehdr = (Elf32_Ehdr*) ehdrC;
+ Elf32_Shdr* shdr = (Elf32_Shdr*) (ehdrC + ehdr->e_shoff);
+ Elf32_Word* targ;
+
+ /* first find "the" symbol table */
+ stab = (Elf32_Sym*) findElfSection ( ehdrC, SHT_SYMTAB );
+
+ /* also go find the string table */
+ strtab = findElfSection ( ehdrC, SHT_STRTAB );
+
+ if (!stab || !strtab) {
+ oc->errMsg("can't find string or symbol table");
+ return FALSE;
+ }
+
+ for (i = 0; i < ehdr->e_shnum; i++) {
+ if (shdr[i].sh_type == SHT_REL ) {
+ Elf32_Rel* rtab = (Elf32_Rel*) (ehdrC + shdr[i].sh_offset);
+ Int nent = shdr[i].sh_size / sizeof(Elf32_Rel);
+ Int target_shndx = shdr[i].sh_info;
+ Int symtab_shndx = shdr[i].sh_link;
+ stab = (Elf32_Sym*) (ehdrC + shdr[ symtab_shndx ].sh_offset);
+ targ = (Elf32_Word*)(ehdrC + shdr[ target_shndx ].sh_offset);
+ if (verb)
+ fprintf ( stderr,
+ "relocations for section %d using symtab %d\n",
+ target_shndx, symtab_shndx );
+ for (j = 0; j < nent; j++) {
+ Elf32_Addr offset = rtab[j].r_offset;
+ Elf32_Word info = rtab[j].r_info;
+
+ Elf32_Addr P = ((Elf32_Addr)targ) + offset;
+ Elf32_Word* pP = (Elf32_Word*)P;
+ Elf32_Addr A = *pP;
+ Elf32_Addr S;
+
+ if (verb) fprintf ( stderr, "Rel entry %3d is raw(%6p %6p) ",
+ j, (void*)offset, (void*)info );
+ if (!info) {
+ if (verb) fprintf ( stderr, " ZERO\n" );
+ S = 0;
+ } else {
+ /* First see if it is a nameless local symbol. */
+ if (stab[ ELF32_R_SYM(info)].st_name == 0) {
+ if (verb) fprintf ( stderr, "(noname) ");
+ S = (Elf32_Addr)(ehdrC
+ + shdr[stab[ELF32_R_SYM(info)].st_shndx ].sh_offset
+ + stab[ELF32_R_SYM(info)].st_value
+ );
+ strcpy ( symbol, "(noname)");
+ } else {
+ /* No? Perhaps it's a named symbol in this file. */
+ strcpy ( symbol, strtab+stab[ ELF32_R_SYM(info)].st_name );
+ if (verb) fprintf ( stderr, "`%s' ", symbol );
+ S = (Elf32_Addr)lookupSymbol ( oc, symbol );
+ if (!S) {
+ /* No? Ok, too hard. Hand the problem to the client.
+ And if that fails, we're outta options.
+ */
+ S = (Elf32_Addr)(oc->clientLookup ( symbol ) );
+ }
+ }
+ if (verb) fprintf ( stderr, "resolves to %p\n", (void*)S );
+ if (!S) {
+ char errtxt[2000];
+ strcpy(errtxt,oc->objFileName);
+ strcat(errtxt,": unresolvable reference to: ");
+ strcat(errtxt,symbol);
+ oc->errMsg(errtxt);
+ return FALSE;
+ }
+ }
+ /* fprintf ( stderr, "Reloc: P = %p S = %p A = %p\n\n",
+ (void*)P, (void*)S, (void*)A );
+ */
+ switch (ELF32_R_TYPE(info)) {
+ case R_386_32: *pP = S + A; break;
+ case R_386_PC32: *pP = S + A - P; break;
+ default: fprintf(stderr,
+ "unhandled ELF relocation type %d\n",
+ ELF32_R_TYPE(info));
+ oc->errMsg("unhandled ELF relocation type");
+ return FALSE;
+ }
+
+ }
+ }
+ else
+ if (shdr[i].sh_type == SHT_RELA) {
+ oc->errMsg("RelA style reloc table -- not yet done");
+ return FALSE;
+ }
+ }
+
+ return TRUE;
+}
+
+
+#endif /* defined(linux_TARGET_OS) || defined(solaris2_TARGET_OS) */
+
+
+
+/*-------------------------------------------------------------------------*/
diff --git a/ghc/interpreter/object.h b/ghc/interpreter/object.h
new file mode 100644
index 000000000000..83bdf3c6669d
--- /dev/null
+++ b/ghc/interpreter/object.h
@@ -0,0 +1,115 @@
+
+/* --------------------------------------------------------------------------
+ * Machinery for dynamic loading and linking of object code. Should be
+ * completely independent from the rest of Hugs so we can use it in
+ * other applications if desired.
+ *
+ * The Hugs 98 system is Copyright (c) Mark P Jones, Alastair Reid, the
+ * Yale Haskell Group, and the Oregon Graduate Institute of Science and
+ * Technology, 1994-1999, All rights reserved. It is distributed as
+ * free software under the license in the file "License", which is
+ * included in the distribution.
+ *
+ * ------------------------------------------------------------------------*/
+
+#ifndef __HUGS_OBJECT_H
+#define __HUGS_OBJECT_H
+
+/* An entry in a very crude object symbol table */
+typedef struct { char* nm; void* ad; }
+ OSym;
+
+
+/* Indication of section kinds for loaded objects. Needed by
+ the GC for deciding whether or not a pointer on the stack
+ is a code pointer.
+*/
+typedef enum { HUGS_SECTIONKIND_CODE_OR_RODATA,
+ HUGS_SECTIONKIND_RWDATA,
+ HUGS_SECTIONKIND_OTHER,
+ HUGS_SECTIONKIND_NOINFOAVAIL }
+ OSectionKind;
+
+typedef struct { void* start; void* end; OSectionKind kind; }
+ OSection;
+
+
+/* Indication of the status of an ObjectCode structure.
+ NOTINUSE -- currently unused.
+ OIMAGE -- object image is in memory, but that's all.
+ VERIFIED -- OIMAGE + the loaded image has been verified as
+ a valid object file.
+ HAVENAMES -- VERIFIED + names *defined* in this image have been
+ extracted from the image and placed in the oTab,
+ and also section info placed in sectionTab.
+ RESOLVED -- HAVENAMES + all names *used* in this image have
+ successfully been resolved.
+
+*/
+typedef enum { OBJECT_NOTINUSE,
+ OBJECT_OIMAGE,
+ OBJECT_VERIFIED,
+ OBJECT_HAVENAMES,
+ OBJECT_RESOLVED }
+ OStatus;
+
+
+/* Top-level structure for an object module. One of these is allocated
+ for each object file in use. This should really be an abstract type
+ to clients.
+*/
+typedef
+ struct __ObjectCode {
+ OStatus status;
+ char* objFileName;
+ int objFileSize;
+ char* formatName; /* eg "ELF32", "DLL", "COFF", etc. */
+
+ /* proc to call to deliver an error message to the client. */
+ void (*errMsg)(char*);
+
+ /* proc to call to resolve symbols not defined in this module,
+ when asked to resolve symbols in this module */
+ void* (*clientLookup)(char*);
+
+ /* ptr to malloc'd lump of memory holding the obj file */
+ void* oImage;
+
+ /* ptr to object symbol table; lives in mallocville.
+ Dynamically expands. */
+ OSym* oTab;
+ int sizeoTab;
+ int usedoTab;
+
+ /* The section-kind entries for this object module.
+ Dynamically expands. */
+ OSection* sectionTab;
+ int sizesectionTab;
+ int usedsectionTab;
+
+ /* Allow a chain of these things */
+ struct __ObjectCode * next;
+ }
+ ObjectCode;
+
+
+/* The API */
+extern ObjectCode* ocNew ( void (*errMsg)(char*),
+ void* (*clientLookup)(char*),
+ char* objFileName,
+ int objFileSize );
+
+extern int /*Bool*/ ocLoadImage ( ObjectCode* oc, int verb );
+extern int /*Bool*/ ocVerifyImage ( ObjectCode* oc, int verb );
+extern int /*Bool*/ ocGetNames ( ObjectCode* oc, int verb );
+extern int /*Bool*/ ocResolve ( ObjectCode* oc, int verb );
+extern void ocFree ( ObjectCode* oc );
+
+extern void* ocLookupSym ( ObjectCode* oc, char* sym );
+extern char* ocLookupAddr ( ObjectCode* oc, void* addr );
+extern OSectionKind ocLookupSection ( ObjectCode* oc, void* addr );
+
+#endif
+
+/*-------------------------------------------------------------------------*/
+
diff --git a/ghc/interpreter/storage.c b/ghc/interpreter/storage.c
index a8318ca35ee4..9b4b67e1979b 100644
--- a/ghc/interpreter/storage.c
+++ b/ghc/interpreter/storage.c
@@ -9,8 +9,8 @@
* included in the distribution.
*
* $RCSfile: storage.c,v $
- * $Revision: 1.26 $
- * $Date: 1999/12/16 16:34:43 $
+ * $Revision: 1.27 $
+ * $Date: 1999/12/17 16:34:08 $
* ------------------------------------------------------------------------*/
#include "prelude.h"
@@ -18,6 +18,7 @@
#include "backend.h"
#include "connect.h"
#include "errors.h"
+#include "object.h"
#include <setjmp.h>
/*#define DEBUG_SHOWUSE*/
@@ -1335,13 +1336,7 @@ Text t; {
module(moduleHw).tycons = NIL;
module(moduleHw).names = NIL;
module(moduleHw).classes = NIL;
- module(moduleHw).oImage = NULL;
- module(moduleHw).oTab = NULL;
- module(moduleHw).sizeoTab = 0;
- module(moduleHw).usedoTab = 0;
- module(moduleHw).dlTab = NULL;
- module(moduleHw).sizedlTab = 0;
- module(moduleHw).useddlTab = 0;
+ module(moduleHw).object = NULL;
return moduleHw++;
}
@@ -1427,96 +1422,35 @@ Name jrsFindQualName ( Text mn, Text sn )
}
-/* A bit tricky. Assumes that if tab==NULL, then
- currUsed and *currSize must be zero.
-*/
-static
-void* genericExpand ( void* tab,
- int* currSize, int currUsed,
- int initSize, int elemSize )
-{
- int size2;
- void* tab2;
- if (currUsed < *currSize)
- return tab;
- size2 = (*currSize == 0) ? initSize : (2 * *currSize);
- tab2 = malloc ( size2 * elemSize );
- if (!tab2) {
- ERRMSG(0) "Can't allocate enough memory to resize a table"
- EEND;
- }
- if (*currSize > 0)
- memcpy ( tab2, tab, elemSize * *currSize );
- *currSize = size2;
- if (tab) free ( tab );
- return tab2;
-}
-
-void addOTabName ( Module m, char* nm, void* ad )
-{
- module(m).oTab
- = genericExpand ( module(m).oTab,
- &module(m).sizeoTab,
- module(m).usedoTab,
- 8, sizeof(OSym) );
-
- module(m).oTab[ module(m).usedoTab ].nm = nm;
- module(m).oTab[ module(m).usedoTab ].ad = ad;
- module(m).usedoTab++;
-}
-
-
-void addDLSect ( Module m, void* start, void* end, DLSect sect )
-{
- module(m).dlTab
- = genericExpand ( module(m).dlTab,
- &module(m).sizedlTab,
- module(m).useddlTab,
- 4, sizeof(DLTabEnt) );
- module(m).dlTab[ module(m).useddlTab ].start = start;
- module(m).dlTab[ module(m).useddlTab ].end = end;
- module(m).dlTab[ module(m).useddlTab ].sect = sect;
- module(m).useddlTab++;
-}
-
-
-void* lookupOTabName ( Module m, char* nm )
+char* nameFromOPtr ( void* p )
{
int i;
- for (i = 0; i < module(m).usedoTab; i++) {
- if (0)
- fprintf ( stderr,
- "lookupOTabName: request %s, table has %s\n",
- nm, module(m).oTab[i].nm );
- if (0==strcmp(nm,module(m).oTab[i].nm))
- return module(m).oTab[i].ad;
+ Module m;
+ for (m=MODMIN; m<moduleHw; m++) {
+ char* nm = ocLookupAddr ( module(m).object, p );
+ if (nm) return nm;
}
return NULL;
}
-char* nameFromOPtr ( void* p )
+void* lookupOTabName ( Module m, char* sym )
{
- int i;
- Module m;
- for (m=MODMIN; m<moduleHw; m++)
- for (i = 0; i < module(m).usedoTab; i++)
- if (p == module(m).oTab[i].ad)
- return module(m).oTab[i].nm;
- return NULL;
+ return ocLookupSym ( module(m).object, sym );
}
-DLSect lookupDLSect ( void* ad )
+OSectionKind lookupSection ( void* ad )
{
int i;
Module m;
- for (m=MODMIN; m<moduleHw; m++)
- for (i = 0; i < module(m).useddlTab; i++)
- if (module(m).dlTab[i].start <= ad &&
- ad <= module(m).dlTab[i].end)
- return module(m).dlTab[i].sect;
- return HUGS_DL_SECTION_OTHER;
+ for (m=MODMIN; m<moduleHw; m++) {
+ OSectionKind sect
+ = ocLookupSection ( module(m).object, ad );
+ if (sect != HUGS_SECTIONKIND_NOINFOAVAIL)
+ return sect;
+ }
+ return HUGS_SECTIONKIND_OTHER;
}
diff --git a/ghc/interpreter/storage.h b/ghc/interpreter/storage.h
index 74f368c37b93..393188a1330e 100644
--- a/ghc/interpreter/storage.h
+++ b/ghc/interpreter/storage.h
@@ -10,8 +10,8 @@
* included in the distribution.
*
* $RCSfile: storage.h,v $
- * $Revision: 1.21 $
- * $Date: 1999/12/16 16:34:45 $
+ * $Revision: 1.22 $
+ * $Date: 1999/12/17 16:34:08 $
* ------------------------------------------------------------------------*/
/* --------------------------------------------------------------------------
@@ -477,25 +477,6 @@ Tycon addWiredInEnumTycon ( String modNm, String typeNm,
#define offsetOf(c) ((c)-OFFMIN)
#define mkOffset(o) (OFFMIN+(o))
-/* --------------------------------------------------------------------------
- * Object symbols:
- * ------------------------------------------------------------------------*/
-
-/* An entry in a very crude object symbol table */
-typedef struct { char* nm; void* ad; }
- OSym;
-
-/* Indication of section kinds for loaded objects. Needed by
- the GC for deciding whether or not a pointer on the stack
- is a code pointer.
-*/
-typedef enum { HUGS_DL_SECTION_CODE_OR_RODATA,
- HUGS_DL_SECTION_RWDATA,
- HUGS_DL_SECTION_OTHER }
- DLSect;
-
-typedef struct { void* start; void* end; DLSect sect; }
- DLTabEnt;
/* --------------------------------------------------------------------------
* Modules:
@@ -507,6 +488,9 @@ typedef struct { void* start; void* end; DLSect sect; }
#define mkModule(n) (MODMIN+(n))
#define module(n) tabModule[(n)-MODMIN]
+/* Import defns for the ObjectCode struct in Module. */
+#include "object.h"
+
/* Under Haskell 1.3, the list of qualified imports is always a subset
* of the list of unqualified imports. For simplicity and flexibility,
* we do not attempt to exploit this fact - when a module is imported
@@ -532,21 +516,11 @@ struct Module {
/* TRUE if module exists only via GHC primop defn; usually FALSE */
Bool fake;
- /* ptr to malloc'd lump of memory holding the obj file */
- void* oImage;
-
- /* ptr to object symbol table; lives in mallocville.
- Dynamically expands. */
- OSym* oTab;
- Int sizeoTab;
- Int usedoTab;
-
- /* The section-kind entries for this object module. Dynamically expands. */
- DLTabEnt* dlTab;
- Int sizedlTab;
- Int useddlTab;
+ /* One or more object file descriptors. */
+ ObjectCode* object;
};
+
extern Module currentModule; /* Module currently being processed */
extern struct Module DECTABLE(tabModule);
@@ -560,8 +534,8 @@ extern void addOTabName Args((Module,char*,void*));
extern void* lookupOTabName Args((Module,char*));
extern char* nameFromOPtr Args((void*));
-extern void addDLSect Args((Module,void*,void*,DLSect));
-extern DLSect lookupDLSect Args((void*));
+extern void addSection Args((Module,void*,void*,OSectionKind));
+extern OSectionKind lookupSection Args((void*));
#define isPrelude(m) (m==modulePrelude)
--
GitLab