Pass various build, arch and OS flags to DynASM.

3 files changed, 48 insertions, 8 deletions

diff --git a/src/Makefile b/src/Makefile
index 3f733c59..d9bb178b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -249,12 +249,12 @@ endif
 endif
 endif
 
-ifneq (,$(findstring __CELLOS_LV2__ ,$(TARGET_TESTARCH)))
+ifneq (,$(findstring LJ_TARGET_PS3 1,$(TARGET_TESTARCH)))
   TARGET_SYS= PS3
   TARGET_ARCH+= -D__CELLOS_LV2__
   TARGET_XCFLAGS+= -DLUAJIT_USE_SYSMALLOC
 endif
-ifneq (,$(findstring LJ_NO_UNWIND ,$(TARGET_TESTARCH)))
+ifneq (,$(findstring LJ_NO_UNWIND 1,$(TARGET_TESTARCH)))
   TARGET_ARCH+= -DLUAJIT_NO_UNWIND
 endif
 
@@ -377,13 +377,46 @@ DASM_XFLAGS=
 DASM_AFLAGS=
 DASM_ARCH= $(TARGET_LJARCH)
 
+ifneq (,$(findstring LJ_HASJIT 1,$(TARGET_TESTARCH)))
+  DASM_AFLAGS+= -D JIT
+endif
+ifneq (,$(findstring LJ_HASFFI 1,$(TARGET_TESTARCH)))
+  DASM_AFLAGS+= -D FFI
+endif
+ifneq (,$(findstring LJ_DUALNUM 1,$(TARGET_TESTARCH)))
+  DASM_AFLAGS+= -D DUALNUM
+endif
+ifneq (,$(findstring LJ_ARCH_HASFPU 1,$(TARGET_TESTARCH)))
+  DASM_AFLAGS+= -D FPU
+endif
+ifeq (,$(findstring LJ_ABI_SOFTFP 1,$(TARGET_TESTARCH)))
+  DASM_AFLAGS+= -D HF
+endif
+DASM_AFLAGS+= -D VER=$(subst LJ_ARCH_VERSION_,,$(filter LJ_ARCH_VERSION_%,$(subst LJ_ARCH_VERSION ,LJ_ARCH_VERSION_,$(TARGET_TESTARCH))))
+ifeq (Windows,$(TARGET_SYS))
+  DASM_AFLAGS+= -D WIN
+endif
+ifeq (x86,$(TARGET_LJARCH))
+  ifneq (,$(findstring __SSE2__ 1,$(TARGET_TESTARCH)))
+    DASM_AFLAGS+= -D SSE
+  endif
+else
 ifeq (x64,$(TARGET_LJARCH))
+  DASM_AFLAGS+= -D X64
   DASM_ARCH= x86
-  ifeq (Windows,$(TARGET_SYS))
-    DASM_AFLAGS+= -D X64 -D X64WIN
-  else
-    DASM_AFLAGS+= -D X64
+else
+ifeq (ppc,$(TARGET_LJARCH))
+  ifneq (,$(findstring LJ_ARCH_SQRT 1,$(TARGET_TESTARCH)))
+    DASM_AFLAGS+= -D SQRT
   endif
+  ifneq (,$(findstring LJ_ARCH_ROUND 1,$(TARGET_TESTARCH)))
+    DASM_AFLAGS+= -D ROUND
+  endif
+  ifeq (PS3,$(TARGET_SYS))
+    DASM_AFLAGS+= -D PS3
+  endif
+endif
+endif
 endif
 
 DASM_FLAGS= $(DASM_XFLAGS) $(DASM_AFLAGS)
diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat
index cb973fe4..ad6f2113 100644
--- a/src/msvcbuild.bat
+++ b/src/msvcbuild.bat
@@ -29,13 +29,13 @@
 if exist minilua.exe.manifest^

   %LJMT% -manifest minilua.exe.manifest -outputresource:minilua.exe

 

-@set DASMFLAGS=-D X64 -D X64WIN

+@set DASMFLAGS=-D X64 -D WIN

 @if defined CPU goto :XCPU

 @set CPU=%PROCESSOR_ARCHITECTURE%

 :XCPU

 @if "%CPU%"=="AMD64" goto :X64

 @if "%CPU%"=="X64" goto :X64

-@set DASMFLAGS=

+@set DASMFLAGS=-D WIN

 :X64

 minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h vm_x86.dasc

 @if errorlevel 1 goto :BAD

diff --git a/src/vm_x86.dasc b/src/vm_x86.dasc
index 30ee5b67..1cab76eb 100644
--- a/src/vm_x86.dasc
+++ b/src/vm_x86.dasc
@@ -16,6 +16,13 @@
 |
 |//-----------------------------------------------------------------------
 |
+|.if X64
+|.define SSE, 1
+|.if WIN
+|.define X64WIN, 1
+|.endif
+|.endif
+|
 |// Fixed register assignments for the interpreter.
 |// This is very fragile and has many dependencies. Caveat emptor.
 |.define BASE,          edx             // Not C callee-save, refetched anyway.