CW Cyrix's Git Repository Mirror
Browse code

Updating the VBA-M code to revision 1231.

Naram Qashat authored on 2014/09/08 12:20:28
Showing 1 changed files
src/in_gsf/vbam/gba/GBA.h
History View file @ bee3026
... ... 
@@ -1,5 +1,4 @@
1 
-#ifndef GBA_H
2 
-#define GBA_H
1 
+#pragma once
3 2
4 3 
 #include <cstdint>
5 4
... ... 
@@ -42,9 +41,7 @@ union reg_pair
42 41 
 #endif
43 42 
 };
44 43
45 
-#ifndef NO_GBA_MAP
46 44 
 extern memoryMap map[256];
47 
-#endif
48 45
49 46 
 extern reg_pair reg[45];
50 47 
 extern uint8_t biosProtected[4];
... ... 
@@ -57,36 +54,37 @@ extern bool armIrqEnable;
57 54 
 extern bool armState;
58 55 
 extern int armMode;
59 56
60 
-extern int CPULoadRom();
61 
-extern void CPUUpdateRegister(uint32_t, uint16_t);
62 
-extern void CPUInit();
63 
-extern void CPUReset();
64 
-extern void CPULoop(int);
65 
-extern void CPUCheckDMA(int, int);
57 
+int CPULoadRom();
58 
+void CPUUpdateRegister(uint32_t, uint16_t);
59 
+void CPUInit();
60 
+void CPUReset();
61 
+void CPULoop(int);
62 
+void CPUCheckDMA(int, int);
66 63
67 
-const uint32_t R13_IRQ = 18;
68 
-const uint32_t R14_IRQ = 19;
69 
-const uint32_t SPSR_IRQ = 20;
70 
-const uint32_t R13_USR = 26;
71 
-const uint32_t R14_USR = 27;
72 
-const uint32_t R13_SVC = 28;
73 
-const uint32_t R14_SVC = 29;
74 
-const uint32_t SPSR_SVC = 30;
75 
-const uint32_t R13_ABT = 31;
76 
-const uint32_t R14_ABT = 32;
77 
-const uint32_t SPSR_ABT = 33;
78 
-const uint32_t R13_UND = 34;
79 
-const uint32_t R14_UND = 35;
80 
-const uint32_t SPSR_UND = 36;
81 
-const uint32_t R8_FIQ = 37;
82 
-const uint32_t R9_FIQ = 38;
83 
-const uint32_t R10_FIQ = 39;
84 
-const uint32_t R11_FIQ = 40;
85 
-const uint32_t R12_FIQ = 41;
86 
-const uint32_t R13_FIQ = 42;
87 
-const uint32_t R14_FIQ = 43;
88 
-const uint32_t SPSR_FIQ = 44;
64 
+enum
65 
+{
66 
+	R13_IRQ = 18,
67 
+	R14_IRQ,
68 
+	SPSR_IRQ,
69 
+	R13_USR = 26,
70 
+	R14_USR,
71 
+	R13_SVC,
72 
+	R14_SVC,
73 
+	SPSR_SVC,
74 
+	R13_ABT,
75 
+	R14_ABT,
76 
+	SPSR_ABT,
77 
+	R13_UND,
78 
+	R14_UND,
79 
+	SPSR_UND,
80 
+	R8_FIQ,
81 
+	R9_FIQ,
82 
+	R10_FIQ,
83 
+	R11_FIQ,
84 
+	R12_FIQ,
85 
+	R13_FIQ,
86 
+	R14_FIQ,
87 
+	SPSR_FIQ
88 
+};
89 89
90 90 
 #include "Globals.h"
91 
-
92 
-#endif // GBA_H
Browse code

[GSF] Massive code cleanup.

(As an aside, blargg's code style makes me go blarg myself.)

Naram Qashat authored on 2013/05/14 01:07:18
Showing 1 changed files
src/in_gsf/vbam/gba/GBA.h
History View file @ 260239f
... ... 
@@ -3,52 +3,44 @@
3 3
4 4 
 #include <cstdint>
5 5
6 
-/*#define SAVE_GAME_VERSION_1 1
7 
-#define SAVE_GAME_VERSION_2 2
8 
-#define SAVE_GAME_VERSION_3 3
9 
-#define SAVE_GAME_VERSION_4 4
10 
-#define SAVE_GAME_VERSION_5 5
11 
-#define SAVE_GAME_VERSION_6 6
12 
-#define SAVE_GAME_VERSION_7 7
13 
-#define SAVE_GAME_VERSION_8 8
14 
-#define SAVE_GAME_VERSION_9 9
15 
-#define SAVE_GAME_VERSION_10 10
16 
-#define SAVE_GAME_VERSION  SAVE_GAME_VERSION_10*/
6 
+struct memoryMap
7 
+{
8 
+	uint8_t *address;
9 
+	uint32_t mask;
10 
+};
17 11
18 
-typedef struct {
19 
-  uint8_t *address;
20 
-  uint32_t mask;
21 
-} memoryMap;
22 
-
23 
-typedef union {
24 
-  struct {
12 
+union reg_pair
13 
+{
14 
+	struct
15 
+	{
25 16 
 #ifdef WORDS_BIGENDIAN
26 
-    uint8_t B3;
27 
-    uint8_t B2;
28 
-    uint8_t B1;
29 
-    uint8_t B0;
17 
+		uint8_t B3;
18 
+		uint8_t B2;
19 
+		uint8_t B1;
20 
+		uint8_t B0;
30 21 
 #else
31 
-    uint8_t B0;
32 
-    uint8_t B1;
33 
-    uint8_t B2;
34 
-    uint8_t B3;
22 
+		uint8_t B0;
23 
+		uint8_t B1;
24 
+		uint8_t B2;
25 
+		uint8_t B3;
35 26 
 #endif
36 
-  } B;
37 
-  struct {
27 
+	} B;
28 
+	struct
29 
+	{
38 30 
 #ifdef WORDS_BIGENDIAN
39 
-    uint16_t W1;
40 
-    uint16_t W0;
31 
+		uint16_t W1;
32 
+		uint16_t W0;
41 33 
 #else
42 
-    uint16_t W0;
43 
-    uint16_t W1;
34 
+		uint16_t W0;
35 
+		uint16_t W1;
44 36 
 #endif
45 
-  } W;
37 
+	} W;
46 38 
 #ifdef WORDS_BIGENDIAN
47 
-  volatile uint32_t I;
39 
+	volatile uint32_t I;
48 40 
 #else
49 41 
 	uint32_t I;
50 42 
 #endif
51 
-} reg_pair;
43 
+};
52 44
53 45 
 #ifndef NO_GBA_MAP
54 46 
 extern memoryMap map[256];
... ... 
@@ -64,79 +56,37 @@ extern bool V_FLAG;
64 56 
 extern bool armIrqEnable;
65 57 
 extern bool armState;
66 58 
 extern int armMode;
67 
-//extern void (*cpuSaveGameFunc)(u32,u8);
68 
-
69 
-#ifdef BKPT_SUPPORT
70 
-extern uint8_t freezeWorkRAM[0x40000];
71 
-extern uint8_t freezeInternalRAM[0x8000];
72 
-extern uint8_t freezeVRAM[0x18000];
73 
-extern uint8_t freezeOAM[0x400];
74 
-extern uint8_t freezePRAM[0x400];
75 
-extern bool debugger_last;
76 
-extern int  oldreg[18];
77 
-extern char oldbuffer[10];
78 
-#endif
79 59
80 
-extern bool CPUReadGSASnapshot(const char *);
81 
-extern bool CPUReadGSASPSnapshot(const char *);
82 
-extern bool CPUWriteGSASnapshot(const char *, const char *, const char *, const char *);
83 
-extern bool CPUWriteBatteryFile(const char *);
84 
-extern bool CPUReadBatteryFile(const char *);
85 
-extern bool CPUExportEepromFile(const char *);
86 
-extern bool CPUImportEepromFile(const char *);
87 
-extern bool CPUWritePNGFile(const char *);
88 
-extern bool CPUWriteBMPFile(const char *);
89 
-extern void CPUCleanUp();
90 
-//extern void CPUUpdateRender();
91 
-//extern void CPUUpdateRenderBuffers(bool);
92 
-extern bool CPUReadMemState(char *, int);
93 
-extern bool CPUReadState(const char *);
94 
-extern bool CPUWriteMemState(char *, int);
95 
-extern bool CPUWriteState(const char *);
96 
-extern int CPULoadRom(const char *);
97 
-extern void doMirroring(bool);
60 
+extern int CPULoadRom();
98 61 
 extern void CPUUpdateRegister(uint32_t, uint16_t);
99 
-extern void applyTimer ();
100 
-extern void CPUInit(const char *,bool);
62 
+extern void CPUInit();
101 63 
 extern void CPUReset();
102 64 
 extern void CPULoop(int);
103 
-extern void CPUCheckDMA(int,int);
104 
-extern bool CPUIsGBAImage(const char *);
105 
-extern bool CPUIsZipFile(const char *);
106 
-#ifdef PROFILING
107 
-#include "prof/prof.h"
108 
-extern void cpuProfil(profile_segment *seg);
109 
-extern void cpuEnableProfiling(int hz);
110 
-#endif
111 
-
112 
-extern struct EmulatedSystem GBASystem;
65 
+extern void CPUCheckDMA(int, int);
113 66
114 
-#define R13_IRQ  18
115 
-#define R14_IRQ  19
116 
-#define SPSR_IRQ 20
117 
-#define R13_USR  26
118 
-#define R14_USR  27
119 
-#define R13_SVC  28
120 
-#define R14_SVC  29
121 
-#define SPSR_SVC 30
122 
-#define R13_ABT  31
123 
-#define R14_ABT  32
124 
-#define SPSR_ABT 33
125 
-#define R13_UND  34
126 
-#define R14_UND  35
127 
-#define SPSR_UND 36
128 
-#define R8_FIQ   37
129 
-#define R9_FIQ   38
130 
-#define R10_FIQ  39
131 
-#define R11_FIQ  40
132 
-#define R12_FIQ  41
133 
-#define R13_FIQ  42
134 
-#define R14_FIQ  43
135 
-#define SPSR_FIQ 44
67 
+const uint32_t R13_IRQ = 18;
68 
+const uint32_t R14_IRQ = 19;
69 
+const uint32_t SPSR_IRQ = 20;
70 
+const uint32_t R13_USR = 26;
71 
+const uint32_t R14_USR = 27;
72 
+const uint32_t R13_SVC = 28;
73 
+const uint32_t R14_SVC = 29;
74 
+const uint32_t SPSR_SVC = 30;
75 
+const uint32_t R13_ABT = 31;
76 
+const uint32_t R14_ABT = 32;
77 
+const uint32_t SPSR_ABT = 33;
78 
+const uint32_t R13_UND = 34;
79 
+const uint32_t R14_UND = 35;
80 
+const uint32_t SPSR_UND = 36;
81 
+const uint32_t R8_FIQ = 37;
82 
+const uint32_t R9_FIQ = 38;
83 
+const uint32_t R10_FIQ = 39;
84 
+const uint32_t R11_FIQ = 40;
85 
+const uint32_t R12_FIQ = 41;
86 
+const uint32_t R13_FIQ = 42;
87 
+const uint32_t R14_FIQ = 43;
88 
+const uint32_t SPSR_FIQ = 44;
136 89
137 
-//#include "Cheats.h"
138 90 
 #include "Globals.h"
139 
-//#include "EEprom.h"
140 
-//#include "Flash.h"
141 91
142 92 
 #endif // GBA_H
Browse code

[GSF] Removed Types.h because all it really was doing now was including stdint.

Naram Qashat authored on 2013/05/10 19:31:06
Showing 1 changed files
src/in_gsf/vbam/gba/GBA.h
History View file @ 94e4bf3
... ... 
@@ -1,8 +1,7 @@
1 1 
 #ifndef GBA_H
2 2 
 #define GBA_H
3 3
4 
-//#include "../System.h"
5 
-#include "../common/Types.h"
4 
+#include <cstdint>
6 5
7 6 
 /*#define SAVE_GAME_VERSION_1 1
8 7 
 #define SAVE_GAME_VERSION_2 2
Browse code

[GSF] Cleanup, a tiny bit of making sure it was like viogsf, also used the standard integer types and not VBA-M's typedefs.

Naram Qashat authored on 2013/05/10 17:45:36
Showing 1 changed files
src/in_gsf/vbam/gba/GBA.h
History View file @ 58ead5d
... ... 
@@ -4,7 +4,7 @@
4 4 
 //#include "../System.h"
5 5 
 #include "../common/Types.h"
6 6
7 
-#define SAVE_GAME_VERSION_1 1
7 
+/*#define SAVE_GAME_VERSION_1 1
8 8 
 #define SAVE_GAME_VERSION_2 2
9 9 
 #define SAVE_GAME_VERSION_3 3
10 10 
 #define SAVE_GAME_VERSION_4 4
... ... 
@@ -14,40 +14,40 @@
14 14 
 #define SAVE_GAME_VERSION_8 8
15 15 
 #define SAVE_GAME_VERSION_9 9
16 16 
 #define SAVE_GAME_VERSION_10 10
17 
-#define SAVE_GAME_VERSION  SAVE_GAME_VERSION_10
17 
+#define SAVE_GAME_VERSION  SAVE_GAME_VERSION_10*/
18 18
19 19 
 typedef struct {
20 
-  u8 *address;
21 
-  u32 mask;
20 
+  uint8_t *address;
21 
+  uint32_t mask;
22 22 
 } memoryMap;
23 23
24 24 
 typedef union {
25 25 
   struct {
26 26 
 #ifdef WORDS_BIGENDIAN
27 
-    u8 B3;
28 
-    u8 B2;
29 
-    u8 B1;
30 
-    u8 B0;
27 
+    uint8_t B3;
28 
+    uint8_t B2;
29 
+    uint8_t B1;
30 
+    uint8_t B0;
31 31 
 #else
32 
-    u8 B0;
33 
-    u8 B1;
34 
-    u8 B2;
35 
-    u8 B3;
32 
+    uint8_t B0;
33 
+    uint8_t B1;
34 
+    uint8_t B2;
35 
+    uint8_t B3;
36 36 
 #endif
37 37 
   } B;
38 38 
   struct {
39 39 
 #ifdef WORDS_BIGENDIAN
40 
-    u16 W1;
41 
-    u16 W0;
40 
+    uint16_t W1;
41 
+    uint16_t W0;
42 42 
 #else
43 
-    u16 W0;
44 
-    u16 W1;
43 
+    uint16_t W0;
44 
+    uint16_t W1;
45 45 
 #endif
46 46 
   } W;
47 47 
 #ifdef WORDS_BIGENDIAN
48 
-  volatile u32 I;
48 
+  volatile uint32_t I;
49 49 
 #else
50 
-	u32 I;
50 
+	uint32_t I;
51 51 
 #endif
52 52 
 } reg_pair;
53 53
... ... 
@@ -56,7 +56,7 @@ extern memoryMap map[256];
56 56 
 #endif
57 57
58 58 
 extern reg_pair reg[45];
59 
-extern u8 biosProtected[4];
59 
+extern uint8_t biosProtected[4];
60 60
61 61 
 extern bool N_FLAG;
62 62 
 extern bool Z_FLAG;
... ... 
@@ -68,11 +68,11 @@ extern int armMode;
68 68 
 //extern void (*cpuSaveGameFunc)(u32,u8);
69 69
70 70 
 #ifdef BKPT_SUPPORT
71 
-extern u8 freezeWorkRAM[0x40000];
72 
-extern u8 freezeInternalRAM[0x8000];
73 
-extern u8 freezeVRAM[0x18000];
74 
-extern u8 freezeOAM[0x400];
75 
-extern u8 freezePRAM[0x400];
71 
+extern uint8_t freezeWorkRAM[0x40000];
72 
+extern uint8_t freezeInternalRAM[0x8000];
73 
+extern uint8_t freezeVRAM[0x18000];
74 
+extern uint8_t freezeOAM[0x400];
75 
+extern uint8_t freezePRAM[0x400];
76 76 
 extern bool debugger_last;
77 77 
 extern int  oldreg[18];
78 78 
 extern char oldbuffer[10];
... ... 
@@ -96,7 +96,7 @@ extern bool CPUWriteMemState(char *, int);
96 96 
 extern bool CPUWriteState(const char *);
97 97 
 extern int CPULoadRom(const char *);
98 98 
 extern void doMirroring(bool);
99 
-extern void CPUUpdateRegister(u32, u16);
99 
+extern void CPUUpdateRegister(uint32_t, uint16_t);
100 100 
 extern void applyTimer ();
101 101 
 extern void CPUInit(const char *,bool);
102 102 
 extern void CPUReset();
Browse code

Import actual code.

Naram Qashat authored on 2013/03/26 02:41:19
Showing 1 changed files
src/in_gsf/vbam/gba/GBA.h
History View file @ bc076aa
1 1 
new file mode 100644
... ... 
@@ -0,0 +1,143 @@
1 
+#ifndef GBA_H
2 
+#define GBA_H
3 
+
4 
+//#include "../System.h"
5 
+#include "../common/Types.h"
6 
+
7 
+#define SAVE_GAME_VERSION_1 1
8 
+#define SAVE_GAME_VERSION_2 2
9 
+#define SAVE_GAME_VERSION_3 3
10 
+#define SAVE_GAME_VERSION_4 4
11 
+#define SAVE_GAME_VERSION_5 5
12 
+#define SAVE_GAME_VERSION_6 6
13 
+#define SAVE_GAME_VERSION_7 7
14 
+#define SAVE_GAME_VERSION_8 8
15 
+#define SAVE_GAME_VERSION_9 9
16 
+#define SAVE_GAME_VERSION_10 10
17 
+#define SAVE_GAME_VERSION  SAVE_GAME_VERSION_10
18 
+
19 
+typedef struct {
20 
+  u8 *address;
21 
+  u32 mask;
22 
+} memoryMap;
23 
+
24 
+typedef union {
25 
+  struct {
26 
+#ifdef WORDS_BIGENDIAN
27 
+    u8 B3;
28 
+    u8 B2;
29 
+    u8 B1;
30 
+    u8 B0;
31 
+#else
32 
+    u8 B0;
33 
+    u8 B1;
34 
+    u8 B2;
35 
+    u8 B3;
36 
+#endif
37 
+  } B;
38 
+  struct {
39 
+#ifdef WORDS_BIGENDIAN
40 
+    u16 W1;
41 
+    u16 W0;
42 
+#else
43 
+    u16 W0;
44 
+    u16 W1;
45 
+#endif
46 
+  } W;
47 
+#ifdef WORDS_BIGENDIAN
48 
+  volatile u32 I;
49 
+#else
50 
+	u32 I;
51 
+#endif
52 
+} reg_pair;
53 
+
54 
+#ifndef NO_GBA_MAP
55 
+extern memoryMap map[256];
56 
+#endif
57 
+
58 
+extern reg_pair reg[45];
59 
+extern u8 biosProtected[4];
60 
+
61 
+extern bool N_FLAG;
62 
+extern bool Z_FLAG;
63 
+extern bool C_FLAG;
64 
+extern bool V_FLAG;
65 
+extern bool armIrqEnable;
66 
+extern bool armState;
67 
+extern int armMode;
68 
+//extern void (*cpuSaveGameFunc)(u32,u8);
69 
+
70 
+#ifdef BKPT_SUPPORT
71 
+extern u8 freezeWorkRAM[0x40000];
72 
+extern u8 freezeInternalRAM[0x8000];
73 
+extern u8 freezeVRAM[0x18000];
74 
+extern u8 freezeOAM[0x400];
75 
+extern u8 freezePRAM[0x400];
76 
+extern bool debugger_last;
77 
+extern int  oldreg[18];
78 
+extern char oldbuffer[10];
79 
+#endif
80 
+
81 
+extern bool CPUReadGSASnapshot(const char *);
82 
+extern bool CPUReadGSASPSnapshot(const char *);
83 
+extern bool CPUWriteGSASnapshot(const char *, const char *, const char *, const char *);
84 
+extern bool CPUWriteBatteryFile(const char *);
85 
+extern bool CPUReadBatteryFile(const char *);
86 
+extern bool CPUExportEepromFile(const char *);
87 
+extern bool CPUImportEepromFile(const char *);
88 
+extern bool CPUWritePNGFile(const char *);
89 
+extern bool CPUWriteBMPFile(const char *);
90 
+extern void CPUCleanUp();
91 
+//extern void CPUUpdateRender();
92 
+//extern void CPUUpdateRenderBuffers(bool);
93 
+extern bool CPUReadMemState(char *, int);
94 
+extern bool CPUReadState(const char *);
95 
+extern bool CPUWriteMemState(char *, int);
96 
+extern bool CPUWriteState(const char *);
97 
+extern int CPULoadRom(const char *);
98 
+extern void doMirroring(bool);
99 
+extern void CPUUpdateRegister(u32, u16);
100 
+extern void applyTimer ();
101 
+extern void CPUInit(const char *,bool);
102 
+extern void CPUReset();
103 
+extern void CPULoop(int);
104 
+extern void CPUCheckDMA(int,int);
105 
+extern bool CPUIsGBAImage(const char *);
106 
+extern bool CPUIsZipFile(const char *);
107 
+#ifdef PROFILING
108 
+#include "prof/prof.h"
109 
+extern void cpuProfil(profile_segment *seg);
110 
+extern void cpuEnableProfiling(int hz);
111 
+#endif
112 
+
113 
+extern struct EmulatedSystem GBASystem;
114 
+
115 
+#define R13_IRQ  18
116 
+#define R14_IRQ  19
117 
+#define SPSR_IRQ 20
118 
+#define R13_USR  26
119 
+#define R14_USR  27
120 
+#define R13_SVC  28
121 
+#define R14_SVC  29
122 
+#define SPSR_SVC 30
123 
+#define R13_ABT  31
124 
+#define R14_ABT  32
125 
+#define SPSR_ABT 33
126 
+#define R13_UND  34
127 
+#define R14_UND  35
128 
+#define SPSR_UND 36
129 
+#define R8_FIQ   37
130 
+#define R9_FIQ   38
131 
+#define R10_FIQ  39
132 
+#define R11_FIQ  40
133 
+#define R12_FIQ  41
134 
+#define R13_FIQ  42
135 
+#define R14_FIQ  43
136 
+#define SPSR_FIQ 44
137 
+
138 
+//#include "Cheats.h"
139 
+#include "Globals.h"
140 
+//#include "EEprom.h"
141 
+//#include "Flash.h"
142 
+
143 
+#endif // GBA_H