1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
diff -uprb vbam.orig/src/gba/GBA-arm.cpp vbam/src/gba/GBA-arm.cpp
--- vbam.orig/src/gba/GBA-arm.cpp 2015-12-07 23:23:30.613871906 +0200
+++ vbam/src/gba/GBA-arm.cpp 2015-12-07 23:25:49.425706904 +0200
@@ -298,18 +298,18 @@ static void count(u32 opcode, int cond_r
#ifdef __GNUC__
#define ALU_HEADER asm("mov %%ecx, %%edi; "
#define ALU_TRAILER : "=D" (opcode) : "c" (opcode) : "eax", "ebx", "edx", "esi")
- #define EMIT0(op) #op"; "
- #define EMIT1(op,arg) #op" "arg"; "
- #define EMIT2(op,src,dest) #op" "src", "dest"; "
- #define KONST(val) "$"#val
+ #define EMIT0(op) #op "; "
+ #define EMIT1(op,arg) #op " " arg "; "
+ #define EMIT2(op,src,dest) #op " " src ", " dest "; "
+ #define KONST(val) "$" #val
#define ASMVAR(cvar) ASMVAR2 (__USER_LABEL_PREFIX__, cvar)
#define ASMVAR2(prefix,cvar) STRING (prefix) cvar
#define STRING(x) #x
#define VAR(var) ASMVAR(#var)
#define VARL(var) ASMVAR(#var)
- #define REGREF1(index) ASMVAR("reg("index")")
- #define REGREF2(index,scale) ASMVAR("reg(,"index","#scale")")
- #define LABEL(n) #n": "
+ #define REGREF1(index) ASMVAR("reg(" index ")")
+ #define REGREF2(index,scale) ASMVAR("reg(," index "," #scale ")")
+ #define LABEL(n) #n ": "
#define LABELREF(n,dir) #n#dir
#define al "%%al"
#define ah "%%ah"
diff -uprb vbam.orig/src/gba/GBA-thumb.cpp vbam/src/gba/GBA-thumb.cpp
--- vbam.orig/src/gba/GBA-thumb.cpp 2015-12-07 23:23:30.613871906 +0200
+++ vbam/src/gba/GBA-thumb.cpp 2015-12-07 23:26:23.646159392 +0200
@@ -305,15 +305,15 @@ static INSN_REGPARM void thumbBreakpoint
V_FLAG = (Flags >> 26) & 1; \
}
#else
- #define EMIT1(op,arg) #op" "arg"; "
- #define EMIT2(op,src,dest) #op" "src", "dest"; "
- #define KONST(val) "$"#val
+ #define EMIT1(op,arg) #op " " arg "; "
+ #define EMIT2(op,src,dest) #op " " src ", " dest "; "
+ #define KONST(val) "$" #val
#define ASMVAR(cvar) ASMVAR2 (__USER_LABEL_PREFIX__, cvar)
#define ASMVAR2(prefix,cvar) STRING (prefix) cvar
#define STRING(x) #x
#define VAR(var) ASMVAR(#var)
- #define REGREF1(index) ASMVAR("reg("index")")
- #define REGREF2(index,scale) ASMVAR("reg(,"index","#scale")")
+ #define REGREF1(index) ASMVAR("reg(" index ")")
+ #define REGREF2(index,scale) ASMVAR("reg(," index "," #scale ")")
#define eax "%%eax"
#define ecx "%%ecx"
#define edx "%%edx"
|
