start new makefile, migrate to libpicofe

[picodrive.git] / cpu / Cyclone / app.h

diff --git a/cpu/Cyclone/app.h b/cpu/Cyclone/app.h
index 1796e9c..5e468c7 100644 (file)
--- a/cpu/Cyclone/app.h
+++ b/cpu/Cyclone/app.h
@@ -4,12 +4,17 @@
 #include <stdlib.h>\r
 #include <string.h>\r
 \r
-#include "config.h"\r
+#ifndef CONFIG_FILE\r
+#define CONFIG_FILE "config.h"\r
+#endif\r
+#include CONFIG_FILE\r
 \r
 // Disa.c\r
 #include "Disa/Disa.h"\r
 \r
 // Ea.cpp\r
+extern int earead_check_addrerr;\r
+extern int eawrite_check_addrerr;\r
 extern int g_jmp_cycle_table[];\r
 extern int g_jsr_cycle_table[];\r
 extern int g_lea_cycle_table[];\r
@@ -18,6 +23,8 @@ extern int g_movem_cycle_table[];
 int Ea_add_ns(int *tab, int ea); // add nonstandard EA cycles\r
 int EaCalc(int a,int mask,int ea,int size,int top=0,int sign_extend=1); // 6\r
 int EaRead(int a,int v,int ea,int size,int mask,int top=0,int sign_extend=1); // 7\r
+int EaCalcRead(int r_ea,int r,int ea,int size,int mask,int sign_extend=1); // 6\r
+int EaCalcReadNoSE(int r_ea,int r,int ea,int size,int mask);\r
 int EaCanRead(int ea,int size);\r
 int EaWrite(int a,int v,int ea,int size,int mask,int top=0,int sign_extend_ea=1);\r
 int EaCanWrite(int ea);\r
@@ -26,22 +33,24 @@ int EaAn(int ea);
 // Main.cpp\r
 extern int *CyJump;   // Jump table\r
 extern int  ms;       // If non-zero, output in Microsoft ARMASM format\r
-extern char *Narm[4]; // Normal ARM Extensions for operand sizes 0,1,2\r
-extern char *Sarm[4]; // Sign-extend ARM Extensions for operand sizes 0,1,2\r
+extern const char * const Narm[4]; // Normal ARM Extensions for operand sizes 0,1,2\r
+extern const char * const Sarm[4]; // Sign-extend ARM Extensions for operand sizes 0,1,2\r
 extern int  Cycles;   // Current cycles for opcode\r
 extern int  pc_dirty; // something changed PC during processing\r
+extern int  arm_op_count; // for stats\r
 void ot(const char *format, ...);\r
 void ltorg();\r
-void CheckInterrupt(int op);\r
-int MemHandler(int type,int size,int addrreg=0);\r
+int MemHandler(int type,int size,int addrreg=0,int need_addrerr_check=1);\r
 void FlushPC(void);\r
 \r
 // OpAny.cpp\r
+extern int g_op;\r
+extern int opend_op_changes_cycles, opend_check_interrupt, opend_check_trace;\r
 int OpGetFlags(int subtract,int xbit,int sprecialz=0);\r
 void OpUse(int op,int use);\r
-void OpStart(int op,int sea=0,int tea=0);\r
+void OpStart(int op,int sea=0,int tea=0,int op_changes_cycles=0,int supervisor_check=0);\r
 void OpEnd(int sea=0,int tea=0);\r
-int OpBase(int op,int sepa=0);\r
+int OpBase(int op,int size,int sepa=0);\r
 void OpAny(int op);\r
 \r
 //----------------------\r
@@ -87,7 +96,7 @@ int OpTas(int op, int gen_special=0);
 int OpMove(int op);\r
 int OpLea(int op);\r
 void OpFlagsToReg(int high);\r
-void OpRegToFlags(int high);\r
+void OpRegToFlags(int high,int srh_reg=0);\r
 int OpMoveSr(int op);\r
 int OpArithSr(int op);\r
 int OpPea(int op);\r
@@ -95,8 +104,8 @@ int OpMovem(int op);
 int OpMoveq(int op);\r
 int OpMoveUsp(int op);\r
 int OpExg(int op);\r
-int OpMovep(int op); // notaz\r
+int OpMovep(int op);\r
 int OpStopReset(int op);\r
-void SuperCheck(int op);\r
-void SuperEnd(int op);\r
-void SuperChange(int op);\r
+void SuperEnd(void);\r
+void SuperChange(int op,int srh_reg=-1);\r
+\r