ot(" ldr r1,[r0,#-4]\n");\r
ot(" tst r1,r1\n");\r
ot(" movne pc,lr ;@ already uncompressed\n");\r
- ot(" add r3,r12,#0xa000*4 ;@ handler table pointer, r12=dest\n");\r
+ ot(" add r3,r12,#0xa000*4 ;@ handler table pointer, r12=dest\n");\r
ot("unc_loop%s\n", ms?"":":");\r
ot(" ldrh r1,[r0],#2\n");\r
ot(" and r2,r1,#0xf\n");\r
int func=0;\r
func=0x68+type*0xc+(size<<2); // Find correct offset\r
\r
-#if MEMHANDLERS_NEED_PC\r
- ot(" str r4,[r7,#0x40] ;@ Save PC\n");\r
-#endif\r
#if MEMHANDLERS_NEED_FLAGS\r
ot(" mov r3,r9,lsr #28\n");\r
ot(" strb r3,[r7,#0x46] ;@ Save Flags (NZCV)\n");\r
#endif\r
-#if MEMHANDLERS_NEED_CYCLES\r
- ot(" str r5,[r7,#0x5c] ;@ Save Cycles\n");\r
-#endif\r
\r
+#if (MEMHANDLERS_ADDR_MASK & 0xff000000)\r
+ ot(" bic r0,r0,#0x%08x\n", MEMHANDLERS_ADDR_MASK & 0xff000000);\r
+#endif\r
+#if (MEMHANDLERS_ADDR_MASK & 0x00ff0000)\r
+ ot(" bic r0,r0,#0x%08x\n", MEMHANDLERS_ADDR_MASK & 0x00ff0000);\r
+#endif\r
+#if (MEMHANDLERS_ADDR_MASK & 0x0000ff00)\r
+ ot(" bic r0,r0,#0x%08x\n", MEMHANDLERS_ADDR_MASK & 0x0000ff00);\r
+#endif\r
+#if (MEMHANDLERS_ADDR_MASK & 0x000000ff)\r
+ ot(" bic r0,r0,#0x%08x\n", MEMHANDLERS_ADDR_MASK & 0x000000ff);\r
+#endif\r
ot(" mov lr,pc\n");\r
ot(" ldr pc,[r7,#0x%x] ;@ Call ",func);\r
\r
#if COMPRESS_JUMPTABLE\r
int handlers=0,reps=0,*indexes,ip,u,out;\r
// use some weird compression on the jump table\r
- indexes=(int *)malloc(0x10000*4);\r
- if(!indexes) { printf("ERROR: out of memory\n"); exit(1); }\r
- len=0x10000;\r
+ indexes=(int *)malloc(0x10000*4);\r
+ if(!indexes) { printf("ERROR: out of memory\n"); exit(1); }\r
+ len=0x10000;\r
\r
- ot("CycloneJumpTab%s\n", ms?"":":");\r
- if(ms) {\r
- for(i = 0; i < 0xa000/8; i++)\r
- ot(" dcd 0,0,0,0,0,0,0,0\n");\r
- } else\r
- ot(" .rept 0x%x\n .long 0,0,0,0,0,0,0,0\n .endr\n", 0xa000/8);\r
+ ot("CycloneJumpTab%s\n", ms?"":":");\r
+ if(ms) {\r
+ for(i = 0; i < 0xa000/8; i++)\r
+ ot(" dcd 0,0,0,0,0,0,0,0\n");\r
+ } else\r
+ ot(" .rept 0x%x\n .long 0,0,0,0,0,0,0,0\n .endr\n", 0xa000/8);\r
\r
// hanlers live in "a-line" part of the table\r
- // first output nop,a-line,f-line handlers\r
- ot(ms?" dcd Op____,Op__al,Op__fl,":" .long Op____,Op__al,Op__fl,");\r
- handlers=3;\r
+ // first output nop,a-line,f-line handlers\r
+ ot(ms?" dcd Op____,Op__al,Op__fl,":" .long Op____,Op__al,Op__fl,");\r
+ handlers=3;\r
\r
- for(i=0;i<len;i++)\r
+ for(i=0;i<len;i++)\r
{\r
op=CyJump[i];\r
\r
- for(u=i-1; u>=0; u--) if(op == CyJump[u]) break; // already done with this op?\r
- if(u==-1 && op >= 0) {\r
- ott("Op%.4x",op," ;@ %.4x\n",i,handlers,2);\r
- indexes[op] = handlers;\r
- handlers++;\r
+ for(u=i-1; u>=0; u--) if(op == CyJump[u]) break; // already done with this op?\r
+ if(u==-1 && op >= 0) {\r
+ ott("Op%.4x",op," ;@ %.4x\n",i,handlers,2);\r
+ indexes[op] = handlers;\r
+ handlers++;\r
}\r
- }\r
- if(handlers&7) {\r
- fseek(AsmFile, -1, SEEK_CUR); // remove last comma\r
- for(i = 8-(handlers&7); i > 0; i--)\r
- ot(",000000");\r
- ot("\n");\r
- }\r
- if(ms) {\r
- for(i = (0x4000-handlers)/8; i > 0; i--)\r
- ot(" dcd 0,0,0,0,0,0,0,0\n");\r
- } else {\r
- ot(ms?"":" .rept 0x%x\n .long 0,0,0,0,0,0,0,0\n .endr\n", (0x4000-handlers)/8);\r
- }\r
+ }\r
+ if(handlers&7) {\r
+ fseek(AsmFile, -1, SEEK_CUR); // remove last comma\r
+ for(i = 8-(handlers&7); i > 0; i--)\r
+ ot(",000000");\r
+ ot("\n");\r
+ }\r
+ if(ms) {\r
+ for(i = (0x4000-handlers)/8; i > 0; i--)\r
+ ot(" dcd 0,0,0,0,0,0,0,0\n");\r
+ } else {\r
+ ot(ms?"":" .rept 0x%x\n .long 0,0,0,0,0,0,0,0\n .endr\n", (0x4000-handlers)/8);\r
+ }\r
printf("total distinct hanlers: %i\n",handlers);\r
- // output data\r
- for(i=0,ip=0; i < 0xf000; i++, ip++) {\r
+ // output data\r
+ for(i=0,ip=0; i < 0xf000; i++, ip++) {\r
op=CyJump[i];\r
- if(op == -2) {\r
- // it must skip a-line area, because we keep our data there\r
- ott("0x%.4x", handlers<<4, "\n",0,ip++,1);\r
- ott("0x%.4x", 0x1000, "\n",0,ip,1);\r
- i+=0xfff;\r
- continue;\r
- }\r
- for(reps=1; i < 0xf000; i++, reps++) if(op != CyJump[i+1]) break;\r
- if(op>=0) out=indexes[op]<<4; else out=0; // unrecognised\r
- if(reps <= 0xe || reps==0x10) {\r
- if(reps!=0x10) out|=reps; else out|=0xf; // 0xf means 0x10 (0xf appeared to be unused anyway)\r
- ott("0x%.4x", out, "\n",0,ip,1);\r
+ if(op == -2) {\r
+ // it must skip a-line area, because we keep our data there\r
+ ott("0x%.4x", handlers<<4, "\n",0,ip++,1);\r
+ ott("0x%.4x", 0x1000, "\n",0,ip,1);\r
+ i+=0xfff;\r
+ continue;\r
+ }\r
+ for(reps=1; i < 0xf000; i++, reps++) if(op != CyJump[i+1]) break;\r
+ if(op>=0) out=indexes[op]<<4; else out=0; // unrecognised\r
+ if(reps <= 0xe || reps==0x10) {\r
+ if(reps!=0x10) out|=reps; else out|=0xf; // 0xf means 0x10 (0xf appeared to be unused anyway)\r
+ ott("0x%.4x", out, "\n",0,ip,1);\r
} else {\r
- ott("0x%.4x", out, "\n",0,ip++,1);\r
- ott("0x%.4x", reps,"\n",0,ip,1);\r
- }\r
+ ott("0x%.4x", out, "\n",0,ip++,1);\r
+ ott("0x%.4x", reps,"\n",0,ip,1);\r
+ }\r
}\r
- if(ip&1) ott("0x%.4x", 0, "\n",0,ip++,1);\r
- if(ip&7) fseek(AsmFile, -1, SEEK_CUR); // remove last comma\r
- ot("\n");\r
- if(ip&7) {\r
- for(i = 8-(ip&7); i > 0; i--)\r
- ot(",0x0000");\r
- ot("\n");\r
- }\r
- if(ms) {\r
- for(i = (0x2000-ip/2)/8+1; i > 0; i--)\r
- ot(" dcd 0,0,0,0,0,0,0,0\n");\r
- } else {\r
- ot(" .rept 0x%x\n .long 0,0,0,0,0,0,0,0\n .endr\n", (0x2000-ip/2)/8+1);\r
- }\r
- ot("\n");\r
- free(indexes);\r
+ if(ip&1) ott("0x%.4x", 0, "\n",0,ip++,1);\r
+ if(ip&7) fseek(AsmFile, -1, SEEK_CUR); // remove last comma\r
+ ot("\n");\r
+ if(ip&7) {\r
+ for(i = 8-(ip&7); i > 0; i--)\r
+ ot(",0x0000");\r
+ ot("\n");\r
+ }\r
+ if(ms) {\r
+ for(i = (0x2000-ip/2)/8+1; i > 0; i--)\r
+ ot(" dcd 0,0,0,0,0,0,0,0\n");\r
+ } else {\r
+ ot(" .rept 0x%x\n .long 0,0,0,0,0,0,0,0\n .endr\n", (0x2000-ip/2)/8+1);\r
+ }\r
+ ot("\n");\r
+ free(indexes);\r
#else\r
- ot("CycloneJumpTab%s\n", ms?"":":");\r
+ ot("CycloneJumpTab%s\n", ms?"":":");\r
len=0xfffe; // Hmmm, armasm 2.50.8684 messes up with a 0x10000 long jump table\r
// notaz: same thing with GNU as 2.9-psion-98r2 (reloc overflow)\r
// this is due to COFF objects using only 2 bytes for reloc count\r
else if(op==-3) ott("Op__fl",0, " ;@ %.4x\n",i-7,i,2);\r
else ott("Op____",0, " ;@ %.4x\n",i-7,i,2);\r
}\r
- if(i&7) fseek(AsmFile, -1, SEEK_CUR); // remove last comma\r
+ if(i&7) fseek(AsmFile, -1, SEEK_CUR); // remove last comma\r
\r
ot("\n");\r
ot(";@ notaz: we don't want to crash if we run into those 2 missing opcodes\n");\r
notaz.gp2x.de / picodrive.git / blobdiff