diff options
author | Mike Pall <mike> | 2011-02-17 00:42:57 +0100 |
---|---|---|
committer | Mike Pall <mike> | 2011-02-17 00:42:57 +0100 |
commit | 963f05c7e153714921484e0de71a7cb6bab338d9 (patch) | |
tree | 0837f685b31b184fef90c166226a3f807f42782d /src | |
parent | 54b6054087df67e67931e774f475740ac2c03062 (diff) | |
download | luajit-963f05c7e153714921484e0de71a7cb6bab338d9.tar.gz luajit-963f05c7e153714921484e0de71a7cb6bab338d9.tar.bz2 luajit-963f05c7e153714921484e0de71a7cb6bab338d9.zip |
DUALNUM: Add build infrastructure.
Note: DUALNUM is disabled by default and won't work yet.
Diffstat (limited to 'src')
-rw-r--r-- | src/lj_arch.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/lj_arch.h b/src/lj_arch.h index c728742f..5e866fe4 100644 --- a/src/lj_arch.h +++ b/src/lj_arch.h | |||
@@ -107,6 +107,7 @@ | |||
107 | #define LJ_TARGET_EHRETREG 0 | 107 | #define LJ_TARGET_EHRETREG 0 |
108 | #define LJ_TARGET_MASKSHIFT 1 | 108 | #define LJ_TARGET_MASKSHIFT 1 |
109 | #define LJ_TARGET_MASKROT 1 | 109 | #define LJ_TARGET_MASKROT 1 |
110 | #define LJ_ARCH_DUALNUM 1 | ||
110 | 111 | ||
111 | #elif LUAJIT_TARGET == LUAJIT_ARCH_X64 | 112 | #elif LUAJIT_TARGET == LUAJIT_ARCH_X64 |
112 | 113 | ||
@@ -120,6 +121,7 @@ | |||
120 | #define LJ_TARGET_EHRETREG 0 | 121 | #define LJ_TARGET_EHRETREG 0 |
121 | #define LJ_TARGET_MASKSHIFT 1 | 122 | #define LJ_TARGET_MASKSHIFT 1 |
122 | #define LJ_TARGET_MASKROT 1 | 123 | #define LJ_TARGET_MASKROT 1 |
124 | #define LJ_ARCH_DUALNUM 1 | ||
123 | 125 | ||
124 | #elif LUAJIT_TARGET == LUAJIT_ARCH_ARM | 126 | #elif LUAJIT_TARGET == LUAJIT_ARCH_ARM |
125 | 127 | ||
@@ -134,6 +136,7 @@ | |||
134 | #define LJ_TARGET_EHRETREG 0 | 136 | #define LJ_TARGET_EHRETREG 0 |
135 | #define LJ_TARGET_MASKSHIFT 0 | 137 | #define LJ_TARGET_MASKSHIFT 0 |
136 | #define LJ_TARGET_MASKROT 1 | 138 | #define LJ_TARGET_MASKROT 1 |
139 | #define LJ_ARCH_DUALNUM 2 | ||
137 | #define LJ_ARCH_NOFFI 1 | 140 | #define LJ_ARCH_NOFFI 1 |
138 | #define LJ_ARCH_NOJIT 1 | 141 | #define LJ_ARCH_NOJIT 1 |
139 | 142 | ||
@@ -154,6 +157,7 @@ | |||
154 | #define LJ_TARGET_EHRETREG 3 | 157 | #define LJ_TARGET_EHRETREG 3 |
155 | #define LJ_TARGET_MASKSHIFT 0 | 158 | #define LJ_TARGET_MASKSHIFT 0 |
156 | #define LJ_TARGET_MASKROT 1 | 159 | #define LJ_TARGET_MASKROT 1 |
160 | #define LJ_ARCH_DUALNUM 0 | ||
157 | #define LJ_ARCH_NOFFI 1 /* NYI: comparisons, calls. */ | 161 | #define LJ_ARCH_NOFFI 1 /* NYI: comparisons, calls. */ |
158 | #define LJ_ARCH_NOJIT 1 | 162 | #define LJ_ARCH_NOJIT 1 |
159 | 163 | ||
@@ -207,6 +211,14 @@ | |||
207 | #endif | 211 | #endif |
208 | #endif | 212 | #endif |
209 | 213 | ||
214 | /* Enable or disable the dual-number VM. */ | ||
215 | #if LJ_ARCH_DUALNUM == 2 || \ | ||
216 | (defined(LUAJIT_ENABLE_DUALNUM) && LJ_ARCH_DUALNUM == 1) | ||
217 | #define LJ_DUALNUM 1 | ||
218 | #else | ||
219 | #define LJ_DUALNUM 0 | ||
220 | #endif | ||
221 | |||
210 | /* Disable or enable the JIT compiler. */ | 222 | /* Disable or enable the JIT compiler. */ |
211 | #if defined(LUAJIT_DISABLE_JIT) || defined(LJ_ARCH_NOJIT) | 223 | #if defined(LUAJIT_DISABLE_JIT) || defined(LJ_ARCH_NOJIT) |
212 | #define LJ_HASJIT 0 | 224 | #define LJ_HASJIT 0 |