riscv
/
qemu
mirror of https://gitea.goldendeliverer.com/riscv/qemu.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

target-ppc: convert exceptions generation to TCG 

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5772 c046a42c-6fe2-441c-8c8c-71466251a162
stable-0.10
aurel32 18 years ago
parent
e2eb279809
commit
64adab3fcb
8 changed files with 76 additions and 66 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      cpu-exec.c
  2. 4
      target-ppc/exec.h
  3. 18
      target-ppc/helper.c
  4. 3
      target-ppc/helper.h
  5. 11
      target-ppc/op.c
  6. 48
      target-ppc/op_helper.c
  7. 44
      target-ppc/op_mem.h
  8. 12
      target-ppc/translate.c

2
cpu-exec.c
View File

@ -918,7 +918,7 @@ static inline int handle_cpu_signal(unsigned long pc, unsigned long address,
/* we restore the process signal mask as the sigreturn should /* we restore the process signal mask as the sigreturn should
do it (XXX: use sigsetjmp) */ do it (XXX: use sigsetjmp) */
sigprocmask(SIG_SETMASK, old_set, NULL); sigprocmask(SIG_SETMASK, old_set, NULL);
do_raise_exception_err(env->exception_index, env->error_code); raise_exception_err(env, env->exception_index, env->error_code);
} else { } else {
/* activate soft MMU for this block */ /* activate soft MMU for this block */
cpu_resume_from_signal(env, puc); cpu_resume_from_signal(env, puc);

4
target-ppc/exec.h
View File

@ -94,8 +94,8 @@ static always_inline target_ulong rotl64 (target_ulong i, int n)
#include "softmmu_exec.h" #include "softmmu_exec.h"
#endif /* !defined(CONFIG_USER_ONLY) */ #endif /* !defined(CONFIG_USER_ONLY) */
void do_raise_exception_err (uint32_t exception, int error_code); void raise_exception_err (CPUState *env, int exception, int error_code);
void do_raise_exception (uint32_t exception); void raise_exception (CPUState *env, int exception);
int get_physical_address (CPUState *env, mmu_ctx_t *ctx, target_ulong vaddr, int get_physical_address (CPUState *env, mmu_ctx_t *ctx, target_ulong vaddr,
int rw, int access_type); int rw, int access_type);

18
target-ppc/helper.c
View File

@ -39,6 +39,24 @@
//#define DEBUG_EXCEPTIONS //#define DEBUG_EXCEPTIONS
//#define FLUSH_ALL_TLBS //#define FLUSH_ALL_TLBS
/*****************************************************************************/
/* Exceptions processing */
void raise_exception_err (CPUState *env, int exception, int error_code)
{
#if 0
printf("Raise exception %3x code : %d\n", exception, error_code);
#endif
env->exception_index = exception;
env->error_code = error_code;
cpu_loop_exit();
}
void raise_exception (CPUState *env, int exception)
{
helper_raise_exception_err(exception, 0);
}
/*****************************************************************************/ /*****************************************************************************/
/* PowerPC MMU emulation */ /* PowerPC MMU emulation */

3
target-ppc/helper.h
View File

@ -1,5 +1,8 @@
#include "def-helper.h" #include "def-helper.h"
DEF_HELPER_2(raise_exception_err, void, i32, i32)
DEF_HELPER_0(raise_debug, void)
DEF_HELPER_2(fcmpo, i32, i64, i64) DEF_HELPER_2(fcmpo, i32, i64, i64)
DEF_HELPER_2(fcmpu, i32, i64, i64) DEF_HELPER_2(fcmpu, i32, i64, i64)

11
target-ppc/op.c
View File

@ -26,17 +26,6 @@
#include "helper_regs.h" #include "helper_regs.h"
#include "op_helper.h" #include "op_helper.h"
/* Generate exceptions */
void OPPROTO op_raise_exception_err (void)
{
do_raise_exception_err(PARAM1, PARAM2);
}
void OPPROTO op_debug (void)
{
do_raise_exception(EXCP_DEBUG);
}
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)
/* Segment registers load and store */ /* Segment registers load and store */
void OPPROTO op_load_sr (void) void OPPROTO op_load_sr (void)

48
target-ppc/op_helper.c
View File

@ -46,21 +46,17 @@
/*****************************************************************************/ /*****************************************************************************/
/* Exceptions processing helpers */ /* Exceptions processing helpers */
void do_raise_exception_err (uint32_t exception, int error_code) void helper_raise_exception_err (uint32_t exception, uint32_t error_code)
{ {
#if 0 raise_exception_err(env, exception, error_code);
printf("Raise exception %3x code : %d\n", exception, error_code);
#endif
env->exception_index = exception;
env->error_code = error_code;
cpu_loop_exit();
} }
void do_raise_exception (uint32_t exception) void helper_raise_debug (void)
{ {
do_raise_exception_err(exception, 0); raise_exception(env, EXCP_DEBUG);
} }
/*****************************************************************************/ /*****************************************************************************/
/* Registers load and stores */ /* Registers load and stores */
target_ulong helper_load_cr (void) target_ulong helper_load_cr (void)
@ -430,7 +426,7 @@ static always_inline uint64_t fload_invalid_op_excp (int op)
/* Update the floating-point enabled exception summary */ /* Update the floating-point enabled exception summary */
env->fpscr |= 1 << FPSCR_FEX; env->fpscr |= 1 << FPSCR_FEX;
if (msr_fe0 != 0 || msr_fe1 != 0) if (msr_fe0 != 0 || msr_fe1 != 0)
do_raise_exception_err(POWERPC_EXCP_PROGRAM, POWERPC_EXCP_FP | op); raise_exception_err(env, POWERPC_EXCP_PROGRAM, POWERPC_EXCP_FP | op);
} }
return ret; return ret;
} }
@ -445,8 +441,8 @@ static always_inline uint64_t float_zero_divide_excp (uint64_t arg1, uint64_t ar
/* Update the floating-point enabled exception summary */ /* Update the floating-point enabled exception summary */
env->fpscr |= 1 << FPSCR_FEX; env->fpscr |= 1 << FPSCR_FEX;
if (msr_fe0 != 0 || msr_fe1 != 0) { if (msr_fe0 != 0 || msr_fe1 != 0) {
do_raise_exception_err(POWERPC_EXCP_PROGRAM, raise_exception_err(env, POWERPC_EXCP_PROGRAM,
POWERPC_EXCP_FP | POWERPC_EXCP_FP_ZX); POWERPC_EXCP_FP | POWERPC_EXCP_FP_ZX);
} }
} else { } else {
/* Set the result to infinity */ /* Set the result to infinity */
@ -686,7 +682,7 @@ void helper_float_check_status (void)
(env->error_code & POWERPC_EXCP_FP)) { (env->error_code & POWERPC_EXCP_FP)) {
/* Differred floating-point exception after target FPR update */ /* Differred floating-point exception after target FPR update */
if (msr_fe0 != 0 || msr_fe1 != 0) if (msr_fe0 != 0 || msr_fe1 != 0)
do_raise_exception_err(env->exception_index, env->error_code); raise_exception_err(env, env->exception_index, env->error_code);
} else if (env->fp_status.float_exception_flags & float_flag_overflow) { } else if (env->fp_status.float_exception_flags & float_flag_overflow) {
float_overflow_excp(); float_overflow_excp();
} else if (env->fp_status.float_exception_flags & float_flag_underflow) { } else if (env->fp_status.float_exception_flags & float_flag_underflow) {
@ -699,7 +695,7 @@ void helper_float_check_status (void)
(env->error_code & POWERPC_EXCP_FP)) { (env->error_code & POWERPC_EXCP_FP)) {
/* Differred floating-point exception after target FPR update */ /* Differred floating-point exception after target FPR update */
if (msr_fe0 != 0 || msr_fe1 != 0) if (msr_fe0 != 0 || msr_fe1 != 0)
do_raise_exception_err(env->exception_index, env->error_code); raise_exception_err(env, env->exception_index, env->error_code);
} }
RETURN(); RETURN();
#endif #endif
@ -1356,7 +1352,7 @@ void do_store_msr (void)
T0 = hreg_store_msr(env, T0, 0); T0 = hreg_store_msr(env, T0, 0);
if (T0 != 0) { if (T0 != 0) {
env->interrupt_request |= CPU_INTERRUPT_EXITTB; env->interrupt_request |= CPU_INTERRUPT_EXITTB;
do_raise_exception(T0); raise_exception(env, T0);
} }
} }
@ -1417,7 +1413,7 @@ void do_tw (int flags)
((int32_t)T0 == (int32_t)T1 && (flags & 0x04)) || ((int32_t)T0 == (int32_t)T1 && (flags & 0x04)) ||
((uint32_t)T0 < (uint32_t)T1 && (flags & 0x02)) || ((uint32_t)T0 < (uint32_t)T1 && (flags & 0x02)) ||
((uint32_t)T0 > (uint32_t)T1 && (flags & 0x01))))) { ((uint32_t)T0 > (uint32_t)T1 && (flags & 0x01))))) {
do_raise_exception_err(POWERPC_EXCP_PROGRAM, POWERPC_EXCP_TRAP); raise_exception_err(env, POWERPC_EXCP_PROGRAM, POWERPC_EXCP_TRAP);
} }
} }
@ -1429,7 +1425,7 @@ void do_td (int flags)
((int64_t)T0 == (int64_t)T1 && (flags & 0x04)) || ((int64_t)T0 == (int64_t)T1 && (flags & 0x04)) ||
((uint64_t)T0 < (uint64_t)T1 && (flags & 0x02)) || ((uint64_t)T0 < (uint64_t)T1 && (flags & 0x02)) ||
((uint64_t)T0 > (uint64_t)T1 && (flags & 0x01))))) ((uint64_t)T0 > (uint64_t)T1 && (flags & 0x01)))))
do_raise_exception_err(POWERPC_EXCP_PROGRAM, POWERPC_EXCP_TRAP); raise_exception_err(env, POWERPC_EXCP_PROGRAM, POWERPC_EXCP_TRAP);
} }
#endif #endif
@ -1670,14 +1666,14 @@ void do_load_dcr (void)
if (loglevel != 0) { if (loglevel != 0) {
fprintf(logfile, "No DCR environment\n"); fprintf(logfile, "No DCR environment\n");
} }
do_raise_exception_err(POWERPC_EXCP_PROGRAM, raise_exception_err(env, POWERPC_EXCP_PROGRAM,
POWERPC_EXCP_INVAL | POWERPC_EXCP_INVAL_INVAL); POWERPC_EXCP_INVAL | POWERPC_EXCP_INVAL_INVAL);
} else if (unlikely(ppc_dcr_read(env->dcr_env, T0, &val) != 0)) { } else if (unlikely(ppc_dcr_read(env->dcr_env, T0, &val) != 0)) {
if (loglevel != 0) { if (loglevel != 0) {
fprintf(logfile, "DCR read error %d %03x\n", (int)T0, (int)T0); fprintf(logfile, "DCR read error %d %03x\n", (int)T0, (int)T0);
} }
do_raise_exception_err(POWERPC_EXCP_PROGRAM, raise_exception_err(env, POWERPC_EXCP_PROGRAM,
POWERPC_EXCP_INVAL | POWERPC_EXCP_PRIV_REG); POWERPC_EXCP_INVAL | POWERPC_EXCP_PRIV_REG);
} else { } else {
T0 = val; T0 = val;
} }
@ -1689,14 +1685,14 @@ void do_store_dcr (void)
if (loglevel != 0) { if (loglevel != 0) {
fprintf(logfile, "No DCR environment\n"); fprintf(logfile, "No DCR environment\n");
} }
do_raise_exception_err(POWERPC_EXCP_PROGRAM, raise_exception_err(env, POWERPC_EXCP_PROGRAM,
POWERPC_EXCP_INVAL | POWERPC_EXCP_INVAL_INVAL); POWERPC_EXCP_INVAL | POWERPC_EXCP_INVAL_INVAL);
} else if (unlikely(ppc_dcr_write(env->dcr_env, T0, T1) != 0)) { } else if (unlikely(ppc_dcr_write(env->dcr_env, T0, T1) != 0)) {
if (loglevel != 0) { if (loglevel != 0) {
fprintf(logfile, "DCR write error %d %03x\n", (int)T0, (int)T0); fprintf(logfile, "DCR write error %d %03x\n", (int)T0, (int)T0);
} }
do_raise_exception_err(POWERPC_EXCP_PROGRAM, raise_exception_err(env, POWERPC_EXCP_PROGRAM,
POWERPC_EXCP_INVAL | POWERPC_EXCP_PRIV_REG); POWERPC_EXCP_INVAL | POWERPC_EXCP_PRIV_REG);
} }
} }
@ -2454,7 +2450,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr)
cpu_restore_state(tb, env, pc, NULL); cpu_restore_state(tb, env, pc, NULL);
} }
} }
do_raise_exception_err(env->exception_index, env->error_code); raise_exception_err(env, env->exception_index, env->error_code);
} }
env = saved_env; env = saved_env;
} }

44
target-ppc/op_mem.h
View File

@ -103,9 +103,9 @@ void OPPROTO glue(op_lswx, MEMSUFFIX) (void)
if (likely(T1 != 0)) { if (likely(T1 != 0)) {
if (unlikely((PARAM1 < PARAM2 && (PARAM1 + T1) > PARAM2) || if (unlikely((PARAM1 < PARAM2 && (PARAM1 + T1) > PARAM2) ||
(PARAM1 < PARAM3 && (PARAM1 + T1) > PARAM3))) { (PARAM1 < PARAM3 && (PARAM1 + T1) > PARAM3))) {
do_raise_exception_err(POWERPC_EXCP_PROGRAM, raise_exception_err(env, POWERPC_EXCP_PROGRAM,
POWERPC_EXCP_INVAL | POWERPC_EXCP_INVAL |
POWERPC_EXCP_INVAL_LSWX); POWERPC_EXCP_INVAL_LSWX);
} else { } else {
glue(do_lsw, MEMSUFFIX)(PARAM1); glue(do_lsw, MEMSUFFIX)(PARAM1);
} }
@ -120,9 +120,9 @@ void OPPROTO glue(op_lswx_64, MEMSUFFIX) (void)
if (likely(T1 != 0)) { if (likely(T1 != 0)) {
if (unlikely((PARAM1 < PARAM2 && (PARAM1 + T1) > PARAM2) || if (unlikely((PARAM1 < PARAM2 && (PARAM1 + T1) > PARAM2) ||
(PARAM1 < PARAM3 && (PARAM1 + T1) > PARAM3))) { (PARAM1 < PARAM3 && (PARAM1 + T1) > PARAM3))) {
do_raise_exception_err(POWERPC_EXCP_PROGRAM, raise_exception_err(env, POWERPC_EXCP_PROGRAM,
POWERPC_EXCP_INVAL | POWERPC_EXCP_INVAL |
POWERPC_EXCP_INVAL_LSWX); POWERPC_EXCP_INVAL_LSWX);
} else { } else {
glue(do_lsw_64, MEMSUFFIX)(PARAM1); glue(do_lsw_64, MEMSUFFIX)(PARAM1);
} }
@ -282,7 +282,7 @@ PPC_LDF_OP_64(fs_le, ldfsr);
void OPPROTO glue(op_lwarx, MEMSUFFIX) (void) void OPPROTO glue(op_lwarx, MEMSUFFIX) (void)
{ {
if (unlikely(T0 & 0x03)) { if (unlikely(T0 & 0x03)) {
do_raise_exception(POWERPC_EXCP_ALIGN); raise_exception(env, POWERPC_EXCP_ALIGN);
} else { } else {
T1 = glue(ldu32, MEMSUFFIX)((uint32_t)T0); T1 = glue(ldu32, MEMSUFFIX)((uint32_t)T0);
env->reserve = (uint32_t)T0; env->reserve = (uint32_t)T0;
@ -294,7 +294,7 @@ void OPPROTO glue(op_lwarx, MEMSUFFIX) (void)
void OPPROTO glue(op_lwarx_64, MEMSUFFIX) (void) void OPPROTO glue(op_lwarx_64, MEMSUFFIX) (void)
{ {
if (unlikely(T0 & 0x03)) { if (unlikely(T0 & 0x03)) {
do_raise_exception(POWERPC_EXCP_ALIGN); raise_exception(env, POWERPC_EXCP_ALIGN);
} else { } else {
T1 = glue(ldu32, MEMSUFFIX)((uint64_t)T0); T1 = glue(ldu32, MEMSUFFIX)((uint64_t)T0);
env->reserve = (uint64_t)T0; env->reserve = (uint64_t)T0;
@ -305,7 +305,7 @@ void OPPROTO glue(op_lwarx_64, MEMSUFFIX) (void)
void OPPROTO glue(op_ldarx, MEMSUFFIX) (void) void OPPROTO glue(op_ldarx, MEMSUFFIX) (void)
{ {
if (unlikely(T0 & 0x03)) { if (unlikely(T0 & 0x03)) {
do_raise_exception(POWERPC_EXCP_ALIGN); raise_exception(env, POWERPC_EXCP_ALIGN);
} else { } else {
T1 = glue(ldu64, MEMSUFFIX)((uint32_t)T0); T1 = glue(ldu64, MEMSUFFIX)((uint32_t)T0);
env->reserve = (uint32_t)T0; env->reserve = (uint32_t)T0;
@ -316,7 +316,7 @@ void OPPROTO glue(op_ldarx, MEMSUFFIX) (void)
void OPPROTO glue(op_ldarx_64, MEMSUFFIX) (void) void OPPROTO glue(op_ldarx_64, MEMSUFFIX) (void)
{ {
if (unlikely(T0 & 0x03)) { if (unlikely(T0 & 0x03)) {
do_raise_exception(POWERPC_EXCP_ALIGN); raise_exception(env, POWERPC_EXCP_ALIGN);
} else { } else {
T1 = glue(ldu64, MEMSUFFIX)((uint64_t)T0); T1 = glue(ldu64, MEMSUFFIX)((uint64_t)T0);
env->reserve = (uint64_t)T0; env->reserve = (uint64_t)T0;
@ -328,7 +328,7 @@ void OPPROTO glue(op_ldarx_64, MEMSUFFIX) (void)
void OPPROTO glue(op_lwarx_le, MEMSUFFIX) (void) void OPPROTO glue(op_lwarx_le, MEMSUFFIX) (void)
{ {
if (unlikely(T0 & 0x03)) { if (unlikely(T0 & 0x03)) {
do_raise_exception(POWERPC_EXCP_ALIGN); raise_exception(env, POWERPC_EXCP_ALIGN);
} else { } else {
T1 = glue(ldu32r, MEMSUFFIX)((uint32_t)T0); T1 = glue(ldu32r, MEMSUFFIX)((uint32_t)T0);
env->reserve = (uint32_t)T0; env->reserve = (uint32_t)T0;
@ -340,7 +340,7 @@ void OPPROTO glue(op_lwarx_le, MEMSUFFIX) (void)
void OPPROTO glue(op_lwarx_le_64, MEMSUFFIX) (void) void OPPROTO glue(op_lwarx_le_64, MEMSUFFIX) (void)
{ {
if (unlikely(T0 & 0x03)) { if (unlikely(T0 & 0x03)) {
do_raise_exception(POWERPC_EXCP_ALIGN); raise_exception(env, POWERPC_EXCP_ALIGN);
} else { } else {
T1 = glue(ldu32r, MEMSUFFIX)((uint64_t)T0); T1 = glue(ldu32r, MEMSUFFIX)((uint64_t)T0);
env->reserve = (uint64_t)T0; env->reserve = (uint64_t)T0;
@ -351,7 +351,7 @@ void OPPROTO glue(op_lwarx_le_64, MEMSUFFIX) (void)
void OPPROTO glue(op_ldarx_le, MEMSUFFIX) (void) void OPPROTO glue(op_ldarx_le, MEMSUFFIX) (void)
{ {
if (unlikely(T0 & 0x03)) { if (unlikely(T0 & 0x03)) {
do_raise_exception(POWERPC_EXCP_ALIGN); raise_exception(env, POWERPC_EXCP_ALIGN);
} else { } else {
T1 = glue(ldu64r, MEMSUFFIX)((uint32_t)T0); T1 = glue(ldu64r, MEMSUFFIX)((uint32_t)T0);
env->reserve = (uint32_t)T0; env->reserve = (uint32_t)T0;
@ -362,7 +362,7 @@ void OPPROTO glue(op_ldarx_le, MEMSUFFIX) (void)
void OPPROTO glue(op_ldarx_le_64, MEMSUFFIX) (void) void OPPROTO glue(op_ldarx_le_64, MEMSUFFIX) (void)
{ {
if (unlikely(T0 & 0x03)) { if (unlikely(T0 & 0x03)) {
do_raise_exception(POWERPC_EXCP_ALIGN); raise_exception(env, POWERPC_EXCP_ALIGN);
} else { } else {
T1 = glue(ldu64r, MEMSUFFIX)((uint64_t)T0); T1 = glue(ldu64r, MEMSUFFIX)((uint64_t)T0);
env->reserve = (uint64_t)T0; env->reserve = (uint64_t)T0;
@ -375,7 +375,7 @@ void OPPROTO glue(op_ldarx_le_64, MEMSUFFIX) (void)
void OPPROTO glue(op_stwcx, MEMSUFFIX) (void) void OPPROTO glue(op_stwcx, MEMSUFFIX) (void)
{ {
if (unlikely(T0 & 0x03)) { if (unlikely(T0 & 0x03)) {
do_raise_exception(POWERPC_EXCP_ALIGN); raise_exception(env, POWERPC_EXCP_ALIGN);
} else { } else {
if (unlikely(env->reserve != (uint32_t)T0)) { if (unlikely(env->reserve != (uint32_t)T0)) {
env->crf[0] = xer_so; env->crf[0] = xer_so;
@ -392,7 +392,7 @@ void OPPROTO glue(op_stwcx, MEMSUFFIX) (void)
void OPPROTO glue(op_stwcx_64, MEMSUFFIX) (void) void OPPROTO glue(op_stwcx_64, MEMSUFFIX) (void)
{ {
if (unlikely(T0 & 0x03)) { if (unlikely(T0 & 0x03)) {
do_raise_exception(POWERPC_EXCP_ALIGN); raise_exception(env, POWERPC_EXCP_ALIGN);
} else { } else {
if (unlikely(env->reserve != (uint64_t)T0)) { if (unlikely(env->reserve != (uint64_t)T0)) {
env->crf[0] = xer_so; env->crf[0] = xer_so;
@ -408,7 +408,7 @@ void OPPROTO glue(op_stwcx_64, MEMSUFFIX) (void)
void OPPROTO glue(op_stdcx, MEMSUFFIX) (void) void OPPROTO glue(op_stdcx, MEMSUFFIX) (void)
{ {
if (unlikely(T0 & 0x03)) { if (unlikely(T0 & 0x03)) {
do_raise_exception(POWERPC_EXCP_ALIGN); raise_exception(env, POWERPC_EXCP_ALIGN);
} else { } else {
if (unlikely(env->reserve != (uint32_t)T0)) { if (unlikely(env->reserve != (uint32_t)T0)) {
env->crf[0] = xer_so; env->crf[0] = xer_so;
@ -424,7 +424,7 @@ void OPPROTO glue(op_stdcx, MEMSUFFIX) (void)
void OPPROTO glue(op_stdcx_64, MEMSUFFIX) (void) void OPPROTO glue(op_stdcx_64, MEMSUFFIX) (void)
{ {
if (unlikely(T0 & 0x03)) { if (unlikely(T0 & 0x03)) {
do_raise_exception(POWERPC_EXCP_ALIGN); raise_exception(env, POWERPC_EXCP_ALIGN);
} else { } else {
if (unlikely(env->reserve != (uint64_t)T0)) { if (unlikely(env->reserve != (uint64_t)T0)) {
env->crf[0] = xer_so; env->crf[0] = xer_so;
@ -441,7 +441,7 @@ void OPPROTO glue(op_stdcx_64, MEMSUFFIX) (void)
void OPPROTO glue(op_stwcx_le, MEMSUFFIX) (void) void OPPROTO glue(op_stwcx_le, MEMSUFFIX) (void)
{ {
if (unlikely(T0 & 0x03)) { if (unlikely(T0 & 0x03)) {
do_raise_exception(POWERPC_EXCP_ALIGN); raise_exception(env, POWERPC_EXCP_ALIGN);
} else { } else {
if (unlikely(env->reserve != (uint32_t)T0)) { if (unlikely(env->reserve != (uint32_t)T0)) {
env->crf[0] = xer_so; env->crf[0] = xer_so;
@ -458,7 +458,7 @@ void OPPROTO glue(op_stwcx_le, MEMSUFFIX) (void)
void OPPROTO glue(op_stwcx_le_64, MEMSUFFIX) (void) void OPPROTO glue(op_stwcx_le_64, MEMSUFFIX) (void)
{ {
if (unlikely(T0 & 0x03)) { if (unlikely(T0 & 0x03)) {
do_raise_exception(POWERPC_EXCP_ALIGN); raise_exception(env, POWERPC_EXCP_ALIGN);
} else { } else {
if (unlikely(env->reserve != (uint64_t)T0)) { if (unlikely(env->reserve != (uint64_t)T0)) {
env->crf[0] = xer_so; env->crf[0] = xer_so;
@ -474,7 +474,7 @@ void OPPROTO glue(op_stwcx_le_64, MEMSUFFIX) (void)
void OPPROTO glue(op_stdcx_le, MEMSUFFIX) (void) void OPPROTO glue(op_stdcx_le, MEMSUFFIX) (void)
{ {
if (unlikely(T0 & 0x03)) { if (unlikely(T0 & 0x03)) {
do_raise_exception(POWERPC_EXCP_ALIGN); raise_exception(env, POWERPC_EXCP_ALIGN);
} else { } else {
if (unlikely(env->reserve != (uint32_t)T0)) { if (unlikely(env->reserve != (uint32_t)T0)) {
env->crf[0] = xer_so; env->crf[0] = xer_so;
@ -490,7 +490,7 @@ void OPPROTO glue(op_stdcx_le, MEMSUFFIX) (void)
void OPPROTO glue(op_stdcx_le_64, MEMSUFFIX) (void) void OPPROTO glue(op_stdcx_le_64, MEMSUFFIX) (void)
{ {
if (unlikely(T0 & 0x03)) { if (unlikely(T0 & 0x03)) {
do_raise_exception(POWERPC_EXCP_ALIGN); raise_exception(env, POWERPC_EXCP_ALIGN);
} else { } else {
if (unlikely(env->reserve != (uint64_t)T0)) { if (unlikely(env->reserve != (uint64_t)T0)) {
env->crf[0] = xer_so; env->crf[0] = xer_so;

12
target-ppc/translate.c
View File

@ -293,10 +293,14 @@ static always_inline void gen_update_nip (DisasContext *ctx, target_ulong nip)
#define GEN_EXCP(ctx, excp, error) \ #define GEN_EXCP(ctx, excp, error) \
do { \ do { \
TCGv_i32 t0 = tcg_const_i32(excp); \
TCGv_i32 t1 = tcg_const_i32(error); \
if ((ctx)->exception == POWERPC_EXCP_NONE) { \ if ((ctx)->exception == POWERPC_EXCP_NONE) { \
gen_update_nip(ctx, (ctx)->nip); \ gen_update_nip(ctx, (ctx)->nip); \
} \ } \
gen_op_raise_exception_err((excp), (error)); \ gen_helper_raise_exception_err(t0, t1); \
tcg_temp_free_i32(t0); \
tcg_temp_free_i32(t1); \
ctx->exception = (excp); \ ctx->exception = (excp); \
} while (0) } while (0)
@ -3470,7 +3474,7 @@ static always_inline void gen_goto_tb (DisasContext *ctx, int n,
} }
if (ctx->singlestep_enabled & GDBSTUB_SINGLE_STEP) { if (ctx->singlestep_enabled & GDBSTUB_SINGLE_STEP) {
gen_update_nip(ctx, dest); gen_update_nip(ctx, dest);
gen_op_debug(); gen_helper_raise_debug();
} }
} }
tcg_gen_exit_tb(0); tcg_gen_exit_tb(0);
@ -7233,7 +7237,7 @@ static always_inline void gen_intermediate_code_internal (CPUState *env,
for (bp = env->breakpoints; bp != NULL; bp = bp->next) { for (bp = env->breakpoints; bp != NULL; bp = bp->next) {
if (bp->pc == ctx.nip) { if (bp->pc == ctx.nip) {
gen_update_nip(&ctx, ctx.nip); gen_update_nip(&ctx, ctx.nip);
gen_op_debug(); gen_helper_raise_debug();
break; break;
} }
} }
@ -7344,7 +7348,7 @@ static always_inline void gen_intermediate_code_internal (CPUState *env,
} else if (ctx.exception != POWERPC_EXCP_BRANCH) { } else if (ctx.exception != POWERPC_EXCP_BRANCH) {
if (unlikely(env->singlestep_enabled)) { if (unlikely(env->singlestep_enabled)) {
gen_update_nip(&ctx, ctx.nip); gen_update_nip(&ctx, ctx.nip);
gen_op_debug(); gen_helper_raise_debug();
} }
/* Generate the return instruction */ /* Generate the return instruction */
tcg_gen_exit_tb(0); tcg_gen_exit_tb(0);

Write Preview
Loading…
Cancel
Save