target/alpha: fix tlb_fill trap_arg2 value for instruction fetch
PATCH 1/1 target/alpha: fix tlb_fill trap_arg2 value for instruction fetch
Commit e41c94529740cc26 ("target/alpha: Convert to CPUClass::tlb_fill") slightly changed the way the trap_arg2 value is computed in case of TLB fill. The type of the variable used in the ternary operator has been changed from an int to an enum. This causes the -1 value to not be sign-extended to 64-bit in case of an instruction fetch. The trap_arg2 ends up with 0xffffffff instead of 0xffffffffffffffff. Fix that by changing the -1 into -1LL.
This fixes the execution of user space processes in qemu-system-alpha.
--- target/alpha/helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
target/alpha/helper.c +1 -1
@@ -283,7 +283,7 @@ bool alpha_cpu_tlb_fill(CPUState *cs, vaddr addr, int size, cs->exception_index =EXCP_MMFAULT ; env->trap_arg0 = addr; env->trap_arg1 = fail; - env->trap_arg2 = (access_type ==MMU_INST_FETCH ?-1 : access_type); + env->trap_arg2 = (access_type ==MMU_INST_FETCH ?-1LL : access_type);cpu_loop_exit_restore (cs, retaddr); }
Signature · 1 line
2.23.0.rc1
Quoted 23 lines · Aurelien Jarno
Commit
e41c94529740cc26("target/alpha: Convert toCPUClass::tlb_fill") slightly changed the way thetrap_arg2value is computed in case of TLB fill. The type of the variable used in the ternary operator has been changed from an int to an enum. This causes the -1 value to not be sign-extended to 64-bit in case of an instruction fetch. Thetrap_arg2ends up with0xffffffffinstead of0xffffffffffffffff. Fix that by changing the -1 into -1LL.This fixes the execution of user space processes in qemu-system-alpha.
--- target/alpha/helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)target/alpha/helper.c +0
-0
target/alpha/helper.c bool alpha_cpu_tlb_fill(CPUState *cs, vaddr addr, int size, · line 288
Quoted 7 lines
target/alpha/helper.c +1
-1@@ -283,7 +283,7 @@ bool alpha_cpu_tlb_fill(CPUState *cs, vaddr addr, int size, cs->exception_index =EXCP_MMFAULT ; env->trap_arg0 = addr; env->trap_arg1 = fail; - env->trap_arg2 = (access_type ==MMU_INST_FETCH ?-1 : access_type); + env->trap_arg2 = (access_type ==MMU_INST_FETCH ?-1LL : access_type);cpu_loop_exit_restore (cs, retaddr); }
Oops. Thanks for the catch.
Maybe we should not rely directly on the value of the access_type enum to set trap_arg2 at all (ie just go for a switch on access_type and set env->trap_arg2 to the right h/w value in the three cases)?
thanks
-- PMM
Quoted 34 lines · Peter Maydell
Quoted 23 lines · Aurelien Jarno
Commit
e41c94529740cc26("target/alpha: Convert toCPUClass::tlb_fill") slightly changed the way thetrap_arg2value is computed in case of TLB fill. The type of the variable used in the ternary operator has been changed from an int to an enum. This causes the -1 value to not be sign-extended to 64-bit in case of an instruction fetch. Thetrap_arg2ends up with0xffffffffinstead of0xffffffffffffffff. Fix that by changing the -1 into -1LL.This fixes the execution of user space processes in qemu-system-alpha.
--- target/alpha/helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)target/alpha/helper.c +0
-0target/alpha/helper.c bool alpha_cpu_tlb_fill(CPUState *cs, vaddr addr, int size, · line 288
Quoted 7 lines
target/alpha/helper.c +1
-1@@ -283,7 +283,7 @@ bool alpha_cpu_tlb_fill(CPUState *cs, vaddr addr, int size, cs->exception_index =EXCP_MMFAULT ; env->trap_arg0 = addr; env->trap_arg1 = fail; - env->trap_arg2 = (access_type ==MMU_INST_FETCH ?-1 : access_type); + env->trap_arg2 = (access_type ==MMU_INST_FETCH ?-1LL : access_type);cpu_loop_exit_restore (cs, retaddr); }Oops. Thanks for the catch.
Quoted 3 lines
Maybe we should not rely directly on the value of the
access_typeenum to settrap_arg2at all (ie just go for a switch onaccess_typeand setenv->trap_arg2to the right h/w value in the three cases)?
Yes, I'll do that. I'm somewhat embarrassed that I haven't tested Alpha in a while, and moreso because we just did a release.
r~