diff options
| author | Mike Pall <mike> | 2009-12-17 22:08:20 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2009-12-17 22:08:20 +0100 |
| commit | 6adab430afd9804d616b49658d09ab25c9380725 (patch) | |
| tree | 155629b9598bc975c93454fd0ae6e88edfbad3c2 /src/lj_api.c | |
| parent | 1353acacb16fe988a9c68f1e6ccafb5ac28686e8 (diff) | |
| download | luajit-6adab430afd9804d616b49658d09ab25c9380725.tar.gz luajit-6adab430afd9804d616b49658d09ab25c9380725.tar.bz2 luajit-6adab430afd9804d616b49658d09ab25c9380725.zip | |
Adapt primary inbound calls in x64 interpreter.
Change argument order for lj_vm_cpcall() to simplify x64 interpreter.
Diffstat (limited to 'src/lj_api.c')
| -rw-r--r-- | src/lj_api.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lj_api.c b/src/lj_api.c index 4bac5024..4b7847c8 100644 --- a/src/lj_api.c +++ b/src/lj_api.c | |||
| @@ -1034,7 +1034,7 @@ LUA_API int lua_cpcall(lua_State *L, lua_CFunction func, void *ud) | |||
| 1034 | { | 1034 | { |
| 1035 | global_State *g = G(L); | 1035 | global_State *g = G(L); |
| 1036 | uint8_t oldh = hook_save(g); | 1036 | uint8_t oldh = hook_save(g); |
| 1037 | int status = lj_vm_cpcall(L, cpcall, func, ud); | 1037 | int status = lj_vm_cpcall(L, func, ud, cpcall); |
| 1038 | if (status) hook_restore(g, oldh); | 1038 | if (status) hook_restore(g, oldh); |
| 1039 | return status; | 1039 | return status; |
| 1040 | } | 1040 | } |
| @@ -1106,7 +1106,7 @@ LUA_API int lua_load(lua_State *L, lua_Reader reader, void *data, | |||
| 1106 | ls.rdata = data; | 1106 | ls.rdata = data; |
| 1107 | ls.chunkarg = chunkname ? chunkname : "?"; | 1107 | ls.chunkarg = chunkname ? chunkname : "?"; |
| 1108 | lj_str_initbuf(L, &ls.sb); | 1108 | lj_str_initbuf(L, &ls.sb); |
| 1109 | status = lj_vm_cpcall(L, cpparser, NULL, &ls); | 1109 | status = lj_vm_cpcall(L, NULL, &ls, cpparser); |
| 1110 | g = G(L); | 1110 | g = G(L); |
| 1111 | lj_str_freebuf(g, &ls.sb); | 1111 | lj_str_freebuf(g, &ls.sb); |
| 1112 | lj_gc_check(L); | 1112 | lj_gc_check(L); |