diff options
| author | Mike Pall <mike> | 2014-03-06 17:54:48 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2014-03-06 17:54:48 +0100 |
| commit | 80efb077500ca368b26aab0aadcc4e2e877b10ab (patch) | |
| tree | 7440a974094d400d02536b7091a6f430e4c7bc21 /dynasm | |
| parent | 416abff90dae9c66e17efe9d6a01efce63eefba8 (diff) | |
| download | luajit-80efb077500ca368b26aab0aadcc4e2e877b10ab.tar.gz luajit-80efb077500ca368b26aab0aadcc4e2e877b10ab.tar.bz2 luajit-80efb077500ca368b26aab0aadcc4e2e877b10ab.zip | |
DynASM: Emit version check after .arch directive.
Diffstat (limited to 'dynasm')
| -rw-r--r-- | dynasm/dynasm.lua | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/dynasm/dynasm.lua b/dynasm/dynasm.lua index 2c0970d8..0ea8697c 100644 --- a/dynasm/dynasm.lua +++ b/dynasm/dynasm.lua | |||
| @@ -695,6 +695,9 @@ map_op[".arch_1"] = function(params) | |||
| 695 | if not params then return "name" end | 695 | if not params then return "name" end |
| 696 | local err = loadarch(params[1]) | 696 | local err = loadarch(params[1]) |
| 697 | if err then wfatal(err) end | 697 | if err then wfatal(err) end |
| 698 | wline(format("#if DASM_VERSION != %d", _info.vernum)) | ||
| 699 | wline('#error "Version mismatch between DynASM and included encoding engine"') | ||
| 700 | wline("#endif") | ||
| 698 | end | 701 | end |
| 699 | 702 | ||
| 700 | -- Dummy .arch pseudo-opcode to improve the error report. | 703 | -- Dummy .arch pseudo-opcode to improve the error report. |
| @@ -877,13 +880,9 @@ local function dasmhead(out) | |||
| 877 | ** DO NOT EDIT! The original file is in "%s". | 880 | ** DO NOT EDIT! The original file is in "%s". |
| 878 | */ | 881 | */ |
| 879 | 882 | ||
| 880 | #if DASM_VERSION != %d | ||
| 881 | #error "Version mismatch between DynASM and included encoding engine" | ||
| 882 | #endif | ||
| 883 | |||
| 884 | ]], _info.url, | 883 | ]], _info.url, |
| 885 | _info.version, g_arch._info.arch, g_arch._info.version, | 884 | _info.version, g_arch._info.arch, g_arch._info.version, |
| 886 | g_fname, _info.vernum)) | 885 | g_fname)) |
| 887 | end | 886 | end |
| 888 | 887 | ||
| 889 | -- Read input file. | 888 | -- Read input file. |
