gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-07 23:24:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

x64: Fix DynASM defines.

Browse Source
This commit is contained in:
Mike Pall 2012-06-12 03:50:22 +02:00
parent e08914988c
commit 0528bb7d02
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile
View File

@ -362,6 +362,9 @@ DASM_XFLAGS=
DASM_AFLAGS= DASM_AFLAGS=
DASM_ARCH= $(TARGET_LJARCH) DASM_ARCH= $(TARGET_LJARCH)
ifneq (,$(findstring LJ_ARCH_BITS 64,$(TARGET_TESTARCH)))
DASM_AFLAGS+= -D P64
endif
ifneq (,$(findstring LJ_HASJIT 1,$(TARGET_TESTARCH))) ifneq (,$(findstring LJ_HASJIT 1,$(TARGET_TESTARCH)))
DASM_AFLAGS+= -D JIT DASM_AFLAGS+= -D JIT
endif endif
@ -387,7 +390,6 @@ ifeq (x86,$(TARGET_LJARCH))
endif endif
else else
ifeq (x64,$(TARGET_LJARCH)) ifeq (x64,$(TARGET_LJARCH))
DASM_AFLAGS+= -D X64
DASM_ARCH= x86 DASM_ARCH= x86
else else
ifeq (arm,$(TARGET_LJARCH)) ifeq (arm,$(TARGET_LJARCH))

5
src/vm_x86.dasc
View File

@ -2,7 +2,7 @@
|// Bytecode interpreter, fast functions and helper functions. |// Bytecode interpreter, fast functions and helper functions.
|// Copyright (C) 2005-2012 Mike Pall. See Copyright Notice in luajit.h |// Copyright (C) 2005-2012 Mike Pall. See Copyright Notice in luajit.h
| |
|.if X64 |.if P64
|.arch x64 |.arch x64
|.else |.else
|.arch x86 |.arch x86
@ -16,7 +16,8 @@
| |
|//----------------------------------------------------------------------- |//-----------------------------------------------------------------------
| |
|.if X64 |.if P64
|.define X64, 1
|.define SSE, 1 |.define SSE, 1
|.if WIN |.if WIN
|.define X64WIN, 1 |.define X64WIN, 1