X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=cpu%2FCyclone%2Fapp.h;h=cb36fd7f29f087fec7346e4b682b748e1890a162;hb=ce5be1b51a71786c90d373ffb7f92dc8245f9b12;hp=2742b85683736aee2b8b6d604980b68f104c32d2;hpb=cfb3dfa0f2a36569a6b090e87568b1a1c423f75c;p=picodrive.git

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