procyberian/nasm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

output: macho -- Avoid conversion of addresses to RAWDATA

Browse source 
Without relocation, the linker may do erroneous dead strip.
For the relocation, the conversion of addresses to RAWDATA
should be avoided for Mach-O.

https://bugzilla.nasm.us/show_bug.cgi?id=3392469

Reported-by: Andrew Fish <afish@apple.com>
Signed-off-by: Chang S. Bae <chang.seok.bae@intel.com>
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
This commit is contained in:
Chang S. Bae 2018-05-02 08:07:52 -07:00 committed by Cyrill Gorcunov
parent 69ed82447a
commit 427d8e3e57
3 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
asm/assemble.c
View file

@ -366,7 +366,8 @@ static void out(struct out_data *data)
nasm_assert(data->size <= 8);
asize = data->size;
amax = ofmt->maxbits >> 3; /* Maximum address size in bytes */
if (data->tsegment == fixseg && data->twrt == NO_SEG) {
if ((ofmt->flags & OFMT_KEEP_ADDR) == 0 && data->tsegment == fixseg &&
data->twrt == NO_SEG) {
warn_overflow_out(addrval, asize, data->sign);
xdata.q = cpu_to_le64(addrval);
data->data = xdata.b;

4
include/nasm.h
View file

@ -786,7 +786,9 @@ struct ofmt {
/*
* Output format flags.
*/
#define OFMT_TEXT 1 /* Text file format */
#define OFMT_TEXT 1 /* Text file format */
#define OFMT_KEEP_ADDR 2 /* Keep addr; no conversion to data */
unsigned int flags;
int maxbits; /* Maximum segment bits supported */

18
output/outmacho.c
View file

@ -690,8 +690,8 @@ static void macho_output(int32_t secto, const void *data,
break;
}
case OUT_REL1ADR:
case OUT_REL2ADR:
nasm_assert(section != secto);
p = mydata;
offset = *(int64_t *)data;
@ -708,15 +708,16 @@ static void macho_output(int32_t secto, const void *data,
" this use of WRT");
wrt = NO_SEG; /* we can at least _try_ to continue */
} else {
addr += add_reloc(s, section, addr+size, RL_REL, 2);
addr += add_reloc(s, section, addr+size, RL_REL,
type == OUT_REL1ADR ? 1 : 2);
}
WRITESHORT(p, addr);
sect_write(s, mydata, 2);
sect_write(s, mydata, type == OUT_REL1ADR ? 1 : 2);
break;
case OUT_REL4ADR:
nasm_assert(section != secto);
case OUT_REL8ADR:
p = mydata;
offset = *(int64_t *)data;
@ -770,9 +771,10 @@ static void macho_output(int32_t secto, const void *data,
/* continue with RL_REL */
}
addr += add_reloc(s, section, offset, reltype, 4);
addr += add_reloc(s, section, offset, reltype,
type == OUT_REL4ADR ? 4 : 8);
WRITELONG(p, addr);
sect_write(s, mydata, 4);
sect_write(s, mydata, type == OUT_REL4ADR ? 4 : 8);
break;
default:
@ -2321,7 +2323,7 @@ const struct ofmt of_macho32 = {
"NeXTstep/OpenStep/Rhapsody/Darwin/MacOS X (i386) object files",
"macho32",
".o",
0,
OFMT_KEEP_ADDR,
32,
macho32_df_arr,
&macho32_df_dwarf,
@ -2386,7 +2388,7 @@ const struct ofmt of_macho64 = {
"NeXTstep/OpenStep/Rhapsody/Darwin/MacOS X (x86_64) object files",
"macho64",
".o",
0,
OFMT_KEEP_ADDR,
64,
macho64_df_arr,
&macho64_df_dwarf,