Macintosh-Tools/dingusppc
1
0
Fork 0
mirror of https://github.com/dingusdev/dingusppc.git synced 2024-09-28 10:55:27 +00:00
Code Issues Projects Releases Wiki Activity

stwcx., slwi, and tw fixed

Browse Source
This commit is contained in:
dingusdev 2020-02-12 20:58:51 -07:00
parent c8e03286e7
commit 3d492b7f72
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
cpu/ppc/ppcdisasm.cpp
View File

@ -311,7 +311,10 @@ void opc_rlwinm(PPCDisasmContext* ctx)
if (mb == 0) {
if (me < 32) {
if (sh == (31 - me)) {
fmt_threeop_simm(ctx->instr_str, "slwi", rs, ra, sh);
if (ctx->instr_code & 1)
fmt_threeop_simm(ctx->instr_str, "slwi.", rs, ra, sh);
else
fmt_threeop_simm(ctx->instr_str, "slwi", rs, ra, sh);
return;
}
@ -918,11 +921,23 @@ void opc_group31(PPCDisasmContext* ctx)
case 0x16: /* processor mgmt + byte reversed load and store instructions */
strcpy(opcode, proc_mgmt_str[index]);
if ((index == 4) | (index == 9) | (index == 13) | (index == 16) \
if (index == 4){ /* stwcx. */
if (!rc_set) {
opc_illegal(ctx);
return;
}
else {
if (ra == 0)
ctx->instr_str = my_sprintf("%-8sr%d, 0, r%d", opcode, rs, rb);
else
fmt_threeop(ctx->instr_str, opcode, rs, ra, rb);
return;
}
}
else if ((index == 9) | (index == 13) | (index == 16) \
| (index == 20) | (index == 24) | (index == 28)) {
fmt_threeop(ctx->instr_str, opcode, rs, ra, rb);
return;
break;
}
else if ((index == 18) | (index == 26)) {
ctx->instr_str = my_sprintf("%-8s", opcode);
@ -954,17 +969,13 @@ void opc_group31(PPCDisasmContext* ctx)
if (ctx->simplified) {
strcpy(opcode, trap_cond[rs]);
if (strlen(opcode) == 0) {
opc_illegal(ctx);
return;
if (strlen(opcode) != 0) {
ctx->instr_str = my_sprintf("%-8sr%d, r%d", opcode, ra, rb);
}
ctx->instr_str = my_sprintf("%-8sr%d, r%d", opcode, ra, rb);
}
}
else {
ctx->instr_str = my_sprintf("%-8s%d, r%d, r%d", "tw", rs, ra, rb);
}
ctx->instr_str = my_sprintf("%-8s%d, r%d, r%d", "tw", rs, ra, rb);
}
break;
case 19: /* mfcr */

1
cpu/ppc/test/ppcdisasmtest.csv
View File

@ -216,6 +216,7 @@
0xFFF00100,0x7F8B63B9,nand.,r11,r28,r12
# synchronization instructions
0xFFF00100,0x7D20192D,stwcx.,r9,0,r3
0xFFF03000,0x4C00012C,isync
0xFFF00100,7C0006AC,eieio

Can't render this file because it contains an unexpected character in line 4 and column 24.