Merge pull request #1710 from reicast/skmp/fix-naked-stack-overflow

skmp · web-flow · commit fe2ba8ccf907 · 2019-07-30T11:27:29.000+02:00
Fix naked functions &amp; stack overflow
diff --git a/libswirl/jit/backend/arm32/rec_arm.cpp b/libswirl/jit/backend/arm32/rec_arm.cpp
@@ -317,14 +317,6 @@ struct arm_reg_alloc: RegAlloc<eReg,eFSReg,false>
 arm_reg_alloc reg;
 
 
-#ifdef naked
-#undef naked
-#define naked __attribute__((naked))
-#endif
-
-
-
-
 u32 blockno=0;
 
 #include <map>
diff --git a/libswirl/jit/backend/arm64/rec_arm64.cpp b/libswirl/jit/backend/arm64/rec_arm64.cpp
@@ -19,6 +19,7 @@
 
 #include "types.h"
 
+
 #if FEAT_SHREC == DYNAREC_JIT
 
 #include <unistd.h>
@@ -1414,7 +1415,7 @@ void Arm64RegAlloc::Writeback_FPU(u32 reg, eFReg nreg)
 }
 
 
-extern "C" void do_sqw_nommu_area_3(u32 dst, u8* sqb)
+extern "C" naked void do_sqw_nommu_area_3(u32 dst, u8* sqb)
 {
 	__asm__
 	(
diff --git a/libswirl/types.h b/libswirl/types.h
@@ -351,7 +351,7 @@ using namespace std;
 #if defined(X86) && COMPILER_VC==BUILD_COMPILER
 #define naked   __declspec( naked )
 #else
-#define naked
+#define naked __attribute__((naked))
 #endif
 
 

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`
`20`	`20`	`#include "types.h"`
`21`	`21`
	`22`	`+`
`22`	`23`	`#if FEAT_SHREC == DYNAREC_JIT`
`23`	`24`
`24`	`25`	`#include <unistd.h>`
`@@ -1414,7 +1415,7 @@ void Arm64RegAlloc::Writeback_FPU(u32 reg, eFReg nreg)`
`1414`	`1415`	`}`
`1415`	`1416`
`1416`	`1417`
`1417`		`-extern "C" void do_sqw_nommu_area_3(u32 dst, u8* sqb)`
	`1418`	`+extern "C" naked void do_sqw_nommu_area_3(u32 dst, u8* sqb)`
`1418`	`1419`	`{`
`1419`	`1420`	`__asm__`
`1420`	`1421`	`(`