ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix missing nip updates for instructions that potentially generate 

exceptions from op helpers.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3308 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
j_mayer 2007-10-01 05:22:17 +00:00
parent 7dbe11acd8
commit 30032c940a
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
target-ppc/translate.c
View File

@ -2634,6 +2634,8 @@ static GenOpFunc *gen_op_stwcx[] = {
/* lwarx */ /* lwarx */
GEN_HANDLER(lwarx, 0x1F, 0x14, 0x00, 0x00000001, PPC_RES) GEN_HANDLER(lwarx, 0x1F, 0x14, 0x00, 0x00000001, PPC_RES)
{ {
/* NIP cannot be restored if the memory exception comes from an helper */
gen_update_nip(ctx, ctx->nip - 4);
gen_addr_reg_index(ctx); gen_addr_reg_index(ctx);
op_lwarx(); op_lwarx();
gen_op_store_T1_gpr(rD(ctx->opcode)); gen_op_store_T1_gpr(rD(ctx->opcode));
@ -2642,6 +2644,8 @@ GEN_HANDLER(lwarx, 0x1F, 0x14, 0x00, 0x00000001, PPC_RES)
/* stwcx. */ /* stwcx. */
GEN_HANDLER(stwcx_, 0x1F, 0x16, 0x04, 0x00000000, PPC_RES) GEN_HANDLER(stwcx_, 0x1F, 0x16, 0x04, 0x00000000, PPC_RES)
{ {
/* NIP cannot be restored if the memory exception comes from an helper */
gen_update_nip(ctx, ctx->nip - 4);
gen_addr_reg_index(ctx); gen_addr_reg_index(ctx);
gen_op_load_gpr_T1(rS(ctx->opcode)); gen_op_load_gpr_T1(rS(ctx->opcode));
op_stwcx(); op_stwcx();
@ -2689,6 +2693,8 @@ static GenOpFunc *gen_op_stdcx[] = {
/* ldarx */ /* ldarx */
GEN_HANDLER(ldarx, 0x1F, 0x14, 0x02, 0x00000001, PPC_64B) GEN_HANDLER(ldarx, 0x1F, 0x14, 0x02, 0x00000001, PPC_64B)
{ {
/* NIP cannot be restored if the memory exception comes from an helper */
gen_update_nip(ctx, ctx->nip - 4);
gen_addr_reg_index(ctx); gen_addr_reg_index(ctx);
op_ldarx(); op_ldarx();
gen_op_store_T1_gpr(rD(ctx->opcode)); gen_op_store_T1_gpr(rD(ctx->opcode));
@ -2697,6 +2703,8 @@ GEN_HANDLER(ldarx, 0x1F, 0x14, 0x02, 0x00000001, PPC_64B)
/* stdcx. */ /* stdcx. */
GEN_HANDLER(stdcx_, 0x1F, 0x16, 0x06, 0x00000000, PPC_64B) GEN_HANDLER(stdcx_, 0x1F, 0x16, 0x06, 0x00000000, PPC_64B)
{ {
/* NIP cannot be restored if the memory exception comes from an helper */
gen_update_nip(ctx, ctx->nip - 4);
gen_addr_reg_index(ctx); gen_addr_reg_index(ctx);
gen_op_load_gpr_T1(rS(ctx->opcode)); gen_op_load_gpr_T1(rS(ctx->opcode));
op_stdcx(); op_stdcx();
@ -3612,6 +3620,8 @@ static GenOpFunc *gen_op_icbi[] = {
GEN_HANDLER(icbi, 0x1F, 0x16, 0x1E, 0x03E00001, PPC_CACHE) GEN_HANDLER(icbi, 0x1F, 0x16, 0x1E, 0x03E00001, PPC_CACHE)
{ {
/* NIP cannot be restored if the memory exception comes from an helper */
gen_update_nip(ctx, ctx->nip - 4);
gen_addr_reg_index(ctx); gen_addr_reg_index(ctx);
op_icbi(); op_icbi();
} }