diff options
| author | bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-02-04 22:00:42 +0000 |
|---|---|---|
| committer | bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-02-04 22:00:42 +0000 |
| commit | a4d8670ffcb1c81c386a7e1d4a60cd28221c7772 (patch) | |
| tree | 5c3a3b43d0de16dc887dd05a2a707b7fcdfe2d45 | |
| parent | 3aba3d86f757e96f8ff503fa3f85c771b3a5f533 (diff) | |
| download | focaccia-qemu-a4d8670ffcb1c81c386a7e1d4a60cd28221c7772.tar.gz focaccia-qemu-a4d8670ffcb1c81c386a7e1d4a60cd28221c7772.zip | |
win32 fix
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3965 c046a42c-6fe2-441c-8c8c-71466251a162
| -rw-r--r-- | dyngen.c | 42 |
1 files changed, 31 insertions, 11 deletions
diff --git a/dyngen.c b/dyngen.c index 08380f0ddf..e5122e3732 100644 --- a/dyngen.c +++ b/dyngen.c @@ -1914,17 +1914,37 @@ void gen_code(const char *name, host_ulong offset, host_ulong size, } } type = rel->r_type; - switch(type) { - case DIR32: - fprintf(outfile, " *(uint32_t *)(gen_code_ptr + %d) = %s + %d;\n", - reloc_offset, relname, addend); - break; - case DISP32: - fprintf(outfile, " *(uint32_t *)(gen_code_ptr + %d) = %s - (long)(gen_code_ptr + %d) + %d -4;\n", - reloc_offset, relname, reloc_offset, addend); - break; - default: - error("unsupported i386 relocation (%d)", type); + if (is_label) { +/* TCG uses elf relocation constants */ +#define R_386_32 1 +#define R_386_PC32 2 + switch(type) { + case DIR32: + type = R_386_32; + goto do_reloc; + case DISP32: + type = R_386_PC32; + addend -= 4; + do_reloc: + fprintf(outfile, " tcg_out_reloc(s, gen_code_ptr + %d, %d, %s, %d);\n", + reloc_offset, type, relname, addend); + break; + default: + error("unsupported i386 relocation (%d)", type); + } + } else { + switch(type) { + case DIR32: + fprintf(outfile, " *(uint32_t *)(gen_code_ptr + %d) = %s + %d;\n", + reloc_offset, relname, addend); + break; + case DISP32: + fprintf(outfile, " *(uint32_t *)(gen_code_ptr + %d) = %s - (long)(gen_code_ptr + %d) + %d -4;\n", + reloc_offset, relname, reloc_offset, addend); + break; + default: + error("unsupported i386 relocation (%d)", type); + } } #else #error unsupport object format |