diff options
| author | Mike Pall <mike> | 2014-12-03 14:11:14 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2014-12-03 14:11:14 +0100 |
| commit | 1fc9cd07c3ba21d54b3cec7cec3ea8778ef4919f (patch) | |
| tree | bad325f7e953fb77378c6de57568b0a93d2e5ef7 | |
| parent | 8cc89332ffa3b65a43f6e730df18e282bb66ea41 (diff) | |
| parent | 3f2e4ec69946fa2c37b6a571948ee0909f6ddbea (diff) | |
| download | luajit-1fc9cd07c3ba21d54b3cec7cec3ea8778ef4919f.tar.gz luajit-1fc9cd07c3ba21d54b3cec7cec3ea8778ef4919f.tar.bz2 luajit-1fc9cd07c3ba21d54b3cec7cec3ea8778ef4919f.zip | |
Merge branch 'master' into v2.1
| -rw-r--r-- | dynasm/dasm_arm.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dynasm/dasm_arm.lua b/dynasm/dasm_arm.lua index b3a8827e..3aa8dead 100644 --- a/dynasm/dasm_arm.lua +++ b/dynasm/dasm_arm.lua | |||
| @@ -923,7 +923,7 @@ local function parse_template(params, template, nparams, pos) | |||
| 923 | end | 923 | end |
| 924 | 924 | ||
| 925 | map_op[".template__"] = function(params, template, nparams) | 925 | map_op[".template__"] = function(params, template, nparams) |
| 926 | if not params then return sub(template, 9) end | 926 | if not params then return template:gsub("%x%x%x%x%x%x%x%x", "") end |
| 927 | 927 | ||
| 928 | -- Limit number of section buffer positions used by a single dasm_put(). | 928 | -- Limit number of section buffer positions used by a single dasm_put(). |
| 929 | -- A single opcode needs a maximum of 3 positions. | 929 | -- A single opcode needs a maximum of 3 positions. |