ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor build fixes cxx11 related

This commit is contained in:
Zach Bacon 2016-02-20 18:44:49 -05:00
parent 7ed85a8c6f
commit 48770219fa
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gba/GBA-arm.cpp
View File

@ -298,18 +298,18 @@ static void count(u32 opcode, int cond_res)
#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"

10
src/gba/GBA-thumb.cpp
View File

@ -305,15 +305,15 @@ static INSN_REGPARM void thumbBreakpoint(u32 opcode)
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"