diff options
| author | Avi Kivity <avi@redhat.com> | 2010-06-09 16:50:08 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2010-06-09 16:50:08 +0300 |
| commit | 02152f7275ebede652360c3840cf45fe240d34f0 (patch) | |
| tree | 4cde0b6346683b60ea948415e11265a1518f648c /target-i386 | |
| parent | 82d4ccb9daf67885a0316b1d763ce5ace57cff36 (diff) | |
| parent | 590bf491a49670843ee902c47f7ab1de5e9acd06 (diff) | |
Merge remote branch 'upstream' into next
* upstream:
Fix multiboot compilation
tcg: Make some tcg-target.c routines static.
tcg: Add TYPE parameter to tcg_out_mov.
target-mips: break out [ls][wd]c1 and rdhwr insn generation
Fix --enable-user-pie compilation.
microblaze: Make MSR_UM and MSR_VM part of the tb flags
petlogix-3adsp: Tweak displacement of cmdline and fdt blob.
migration-exec: fix OpenBSD build warning
target-i386: fix decoding of negative 4-byte displacements
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'target-i386')
| -rw-r--r-- | target-i386/translate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target-i386/translate.c b/target-i386/translate.c index 38c601657..708b0a11e 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -2016,7 +2016,7 @@ static void gen_lea_modrm(DisasContext *s, int modrm, int *reg_ptr, int *offset_ break; default: case 2: - disp = ldl_code(s->pc); + disp = (int32_t)ldl_code(s->pc); s->pc += 4; break; } |