diff options
| author | aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-11-06 09:16:57 +0000 |
|---|---|---|
| committer | aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-11-06 09:16:57 +0000 |
| commit | 1304ca878a4e091c193bd4ae273e0b5cb6142237 (patch) | |
| tree | e01c844eac9f80578c340820d8eaac7de1e9fd02 | |
| parent | f49e58dc64a6347dda3233076c85cc80d65fba72 (diff) | |
| download | focaccia-qemu-1304ca878a4e091c193bd4ae273e0b5cb6142237.tar.gz focaccia-qemu-1304ca878a4e091c193bd4ae273e0b5cb6142237.zip | |
target-alpha: Fix ret instruction
Hopefully pine doesn't corrupt this patch, I've had problems recently.
For an alpha "ret" instruction, of the type
ret $26
The return was being ignored. This is because in translate.c
register $26 (the return address) was being over-written with the current
PC before it could be jumped to. Thus the ret was ignored.
This patch just re-orders things so the return address is processed before
it is over-written with the current PC.
(Vince Weaver)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5638 c046a42c-6fe2-441c-8c8c-71466251a162
| -rw-r--r-- | target-alpha/translate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target-alpha/translate.c b/target-alpha/translate.c index 35ffa43b3d..5c88a12a99 100644 --- a/target-alpha/translate.c +++ b/target-alpha/translate.c @@ -1634,12 +1634,12 @@ static always_inline int translate_one (DisasContext *ctx, uint32_t insn) break; #endif case 0x1A: - if (ra != 31) - tcg_gen_movi_i64(cpu_ir[ra], ctx->pc); if (rb != 31) tcg_gen_andi_i64(cpu_pc, cpu_ir[rb], ~3); else tcg_gen_movi_i64(cpu_pc, 0); + if (ra != 31) + tcg_gen_movi_i64(cpu_ir[ra], ctx->pc); /* Those four jumps only differ by the branch prediction hint */ switch (fn2) { case 0x0: |