Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-11-26 10:49:21 +00:00
Code Issues Projects Releases Wiki Activity

Support more reloc types in dyngen.c.

Browse Source
This commit is contained in:
Alexei Svitkine 2012-06-19 00:15:48 -04:00
parent 512c2f5288
commit 1bded034ad
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
SheepShaver/src/kpx_cpu/src/cpu/jit/dyngen.c
View File

@ -2254,6 +2254,7 @@ void patch_relocations(FILE *outfile, const char *name, host_ulong size, host_ul
for (i = 0, rel = relocs, local16 = 0; i < nb_relocs; i++, rel++) { for (i = 0, rel = relocs, local16 = 0; i < nb_relocs; i++, rel++) {
unsigned int isym, usesym, offset, length, pcrel, type; unsigned int isym, usesym, offset, length, pcrel, type;
int adjustment = 0;
isym = rel->r_symbolnum; isym = rel->r_symbolnum;
usesym = rel->r_extern; usesym = rel->r_extern;
@ -2311,13 +2312,28 @@ void patch_relocations(FILE *outfile, const char *name, host_ulong size, host_ul
get_reloc_expr(final_sym_name, sizeof(final_sym_name), sym_name); get_reloc_expr(final_sym_name, sizeof(final_sym_name), sym_name);
switch (type) {
case X86_64_RELOC_SIGNED_1: // Signed displacement with a -1 added.
adjustment = -1;
type = X86_64_RELOC_SIGNED;
break;
case X86_64_RELOC_SIGNED_2: // Signed displacement with a -2 added.
adjustment = -2;
type = X86_64_RELOC_SIGNED;
break;
case X86_64_RELOC_SIGNED_4: // Signed displacement with a -4 added.
adjustment = -4;
type = X86_64_RELOC_SIGNED;
break;
}
if (pcrel || is_op_gen_label(sym_name, &p)) { if (pcrel || is_op_gen_label(sym_name, &p)) {
switch (type) { switch (type) {
case X86_64_RELOC_UNSIGNED: // for absolute addresses case X86_64_RELOC_UNSIGNED: // for absolute addresses
case X86_64_RELOC_SIGNED: // for signed 32-bit displacement case X86_64_RELOC_SIGNED: // for signed 32-bit displacement
case X86_64_RELOC_BRANCH: // a CALL/JMP instruction with 32-bit displacement case X86_64_RELOC_BRANCH: // a CALL/JMP instruction with 32-bit displacement
fprintf(outfile, " *(uint%d_t *)(code_ptr() + %d) = (int%d_t)((long)%s - (long)(code_ptr() + %d + %d)) + %d;\n", fprintf(outfile, " *(uint%d_t *)(code_ptr() + %d) = (int%d_t)((long)%s - (long)(code_ptr() + %d + %d)) + %d;\n",
bitlength, slide, bitlength, final_sym_name, slide, bytecount, sslide); bitlength, slide, bitlength, final_sym_name, slide, bytecount, sslide + adjustment);
break; break;
default: default:
error("unsupported x86_64 relocation (%d) in %s\n", type, sym_name); error("unsupported x86_64 relocation (%d) in %s\n", type, sym_name);
@ -2330,7 +2346,7 @@ void patch_relocations(FILE *outfile, const char *name, host_ulong size, host_ul
break; break;
case X86_64_RELOC_SIGNED: // for signed 32-bit displacement case X86_64_RELOC_SIGNED: // for signed 32-bit displacement
fprintf(outfile, " *(uint%d_t *)(code_ptr() + %d) = (int%d_t)%s + %d;\n", fprintf(outfile, " *(uint%d_t *)(code_ptr() + %d) = (int%d_t)%s + %d;\n",
bitlength, slide, bitlength, final_sym_name, sslide); bitlength, slide, bitlength, final_sym_name, sslide + adjustment);
break; break;
default: default:
error("unsupported x86_64 relocation (%d) in %s\n", type, sym_name); error("unsupported x86_64 relocation (%d) in %s\n", type, sym_name);