From 4e8563d5c4091d9340cb9ed130642c13165bd35f Mon Sep 17 00:00:00 2001 From: Charles Crayne Date: Mon, 5 Nov 2007 17:19:32 -0800 Subject: Upgrade label functions to 64-bit --- output/outaout.c | 2 +- output/outas86.c | 2 +- output/outbin.c | 7 ++++--- output/outcoff.c | 4 ++-- output/outelf32.c | 6 +++--- output/outelf64.c | 6 +++--- output/outieee.c | 4 ++-- output/outmacho.c | 2 +- output/outobj.c | 4 ++-- output/outrdf2.c | 2 +- 10 files changed, 20 insertions(+), 19 deletions(-) (limited to 'output') diff --git a/output/outaout.c b/output/outaout.c index d3e8b01..dae8d39 100644 --- a/output/outaout.c +++ b/output/outaout.c @@ -245,7 +245,7 @@ static int32_t aout_section_names(char *name, int pass, int *bits) return NO_SEG; } -static void aout_deflabel(char *name, int32_t segment, int32_t offset, +static void aout_deflabel(char *name, int32_t segment, int64_t offset, int is_global, char *special) { int pos = strslen + 4; diff --git a/output/outas86.c b/output/outas86.c index 5dbdd41..ddac669 100644 --- a/output/outas86.c +++ b/output/outas86.c @@ -173,7 +173,7 @@ static int as86_add_string(char *name) return pos; } -static void as86_deflabel(char *name, int32_t segment, int32_t offset, +static void as86_deflabel(char *name, int32_t segment, int64_t offset, int is_global, char *special) { struct Symbol *sym; diff --git a/output/outbin.c b/output/outbin.c index bf4c44b..bc36610 100644 --- a/output/outbin.c +++ b/output/outbin.c @@ -662,7 +662,8 @@ static void bin_cleanup(int debuginfo) } /* Display symbols information. */ if (map_control & MAP_SYMBOLS) { - int32_t segment, offset; + int32_t segment; + int64_t offset; fprintf(rf, "-- Symbols "); for (h = 68; h; h--) @@ -675,7 +676,7 @@ static void bin_cleanup(int debuginfo) fprintf(rf, "\n\nValue Name\n"); for (l = no_seg_labels; l; l = l->next) { lookup_label(l->name, &segment, &offset); - fprintf(rf, "%08"PRIX32" %s\n", offset, l->name); + fprintf(rf, "%08"PRIX64" %s\n", offset, l->name); } fprintf(rf, "\n\n"); } @@ -839,7 +840,7 @@ static void bin_out(int32_t segto, const void *data, uint32_t type, } } -static void bin_deflabel(char *name, int32_t segment, int32_t offset, +static void bin_deflabel(char *name, int32_t segment, int64_t offset, int is_global, char *special) { (void)segment; /* Don't warn that this parameter is unused */ diff --git a/output/outcoff.c b/output/outcoff.c index 14c917d..171cd0b 100644 --- a/output/outcoff.c +++ b/output/outcoff.c @@ -358,7 +358,7 @@ static int32_t coff_section_names(char *name, int pass, int *bits) return sects[i]->index; } -static void coff_deflabel(char *name, int32_t segment, int32_t offset, +static void coff_deflabel(char *name, int32_t segment, int64_t offset, int is_global, char *special) { int pos = strslen + 4; @@ -845,7 +845,7 @@ static void coff_write_symbols(void) */ memset(filename, 0, 18); /* useful zeroed buffer */ - for (i = 0; i < nsects; i++) { + for (i = 0; i < (uint32_t) nsects; i++) { coff_symbol(sects[i]->name, 0L, 0L, i + 1, 3, 1); fwriteint32_t(sects[i]->len, coffp); fwriteint16_t(sects[i]->nrelocs, coffp); diff --git a/output/outelf32.c b/output/outelf32.c index 62f6c37..2652f60 100644 --- a/output/outelf32.c +++ b/output/outelf32.c @@ -207,7 +207,7 @@ static struct Symbol *lastsym; void stabs32_init(struct ofmt *, void *, FILE *, efunc); void stabs32_linenum(const char *filename, int32_t linenumber, int32_t); -void stabs32_deflabel(char *, int32_t, int32_t, int, char *); +void stabs32_deflabel(char *, int32_t, int64_t, int, char *); void stabs32_directive(const char *, const char *); void stabs32_typevalue(int32_t); void stabs32_output(int, void *); @@ -444,7 +444,7 @@ static int32_t elf_section_names(char *name, int pass, int *bits) return sects[i]->index; } -static void elf_deflabel(char *name, int32_t segment, int32_t offset, +static void elf_deflabel(char *name, int32_t segment, int64_t offset, int is_global, char *special) { int pos = strslen; @@ -1375,7 +1375,7 @@ void stabs32_linenum(const char *filename, int32_t linenumber, int32_t segto) currentline = linenumber; } -void stabs32_deflabel(char *name, int32_t segment, int32_t offset, int is_global, +void stabs32_deflabel(char *name, int32_t segment, int64_t offset, int is_global, char *special) { (void)name; diff --git a/output/outelf64.c b/output/outelf64.c index 2ef1de3..d3ca8f9 100644 --- a/output/outelf64.c +++ b/output/outelf64.c @@ -218,7 +218,7 @@ static struct Symbol *lastsym; void stabs64_init(struct ofmt *, void *, FILE *, efunc); void stabs64_linenum(const char *filename, int32_t linenumber, int32_t); -void stabs64_deflabel(char *, int32_t, int32_t, int, char *); +void stabs64_deflabel(char *, int32_t, int64_t, int, char *); void stabs64_directive(const char *, const char *); void stabs64_typevalue(int32_t); void stabs64_output(int, void *); @@ -456,7 +456,7 @@ static int32_t elf_section_names(char *name, int pass, int *bits) return sects[i]->index; } -static void elf_deflabel(char *name, int32_t segment, int32_t offset, +static void elf_deflabel(char *name, int32_t segment, int64_t offset, int is_global, char *special) { int pos = strslen; @@ -1389,7 +1389,7 @@ void stabs64_linenum(const char *filename, int32_t linenumber, int32_t segto) currentline = linenumber; } -void stabs64_deflabel(char *name, int32_t segment, int32_t offset, int is_global, +void stabs64_deflabel(char *name, int32_t segment, int64_t offset, int is_global, char *special) { (void)name; diff --git a/output/outieee.c b/output/outieee.c index 8af3cbe..bb9ce9a 100644 --- a/output/outieee.c +++ b/output/outieee.c @@ -255,7 +255,7 @@ static void ieee_cleanup(int debuginfo) * callback for labels */ static void ieee_deflabel(char *name, int32_t segment, - int32_t offset, int is_global, char *special) + int64_t offset, int is_global, char *special) { /* * We have three cases: @@ -1348,7 +1348,7 @@ static void dbgls_linnum(const char *lnfname, int32_t lineno, int32_t segto) } static void dbgls_deflabel(char *name, int32_t segment, - int32_t offset, int is_global, char *special) + int64_t offset, int is_global, char *special) { struct ieeeSection *seg; diff --git a/output/outmacho.c b/output/outmacho.c index b5be2c6..0eeefe5 100644 --- a/output/outmacho.c +++ b/output/outmacho.c @@ -631,7 +631,7 @@ static int32_t macho_section(char *name, int pass, int *bits) return NO_SEG; } -static void macho_symdef(char *name, int32_t section, int32_t offset, +static void macho_symdef(char *name, int32_t section, int64_t offset, int is_global, char *special) { struct symbol *sym; diff --git a/output/outobj.c b/output/outobj.c index a39b4ff..6463d65 100644 --- a/output/outobj.c +++ b/output/outobj.c @@ -726,7 +726,7 @@ static void obj_ext_set_defwrt(struct External *ext, char *id) } static void obj_deflabel(char *name, int32_t segment, - int32_t offset, int is_global, char *special) + int64_t offset, int is_global, char *special) { /* * We have three cases: @@ -2407,7 +2407,7 @@ static void dbgbi_linnum(const char *lnfname, int32_t lineno, int32_t segto) } static void dbgbi_deflabel(char *name, int32_t segment, - int32_t offset, int is_global, char *special) + int64_t offset, int is_global, char *special) { struct Segment *seg; diff --git a/output/outrdf2.c b/output/outrdf2.c index a53282a..0122ff7 100644 --- a/output/outrdf2.c +++ b/output/outrdf2.c @@ -353,7 +353,7 @@ static void write_modname_rec(struct ModRec *r) /* * Handle export, import and common records. */ -static void rdf2_deflabel(char *name, int32_t segment, int32_t offset, +static void rdf2_deflabel(char *name, int32_t segment, int64_t offset, int is_global, char *special) { struct ExportRec r; -- cgit v1.2.3