diff options
| author | Mike Pall <mike> | 2013-12-25 00:27:55 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2013-12-25 00:27:55 +0100 |
| commit | 6e02c210c485791a5451cc74731acf319b2067bb (patch) | |
| tree | aaa8f9f5c9853056d13122e03515695c5dd2ce63 /src | |
| parent | e52119bbdd5eaaee701fa5cccf2edcbfd25601e0 (diff) | |
| parent | ca67c89f209afd4b1be78be0e50064b1a4edebdc (diff) | |
| download | luajit-6e02c210c485791a5451cc74731acf319b2067bb.tar.gz luajit-6e02c210c485791a5451cc74731acf319b2067bb.tar.bz2 luajit-6e02c210c485791a5451cc74731acf319b2067bb.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/vm_mips.dasc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/vm_mips.dasc b/src/vm_mips.dasc index 7d69c7db..f45a5c49 100644 --- a/src/vm_mips.dasc +++ b/src/vm_mips.dasc | |||
| @@ -2120,7 +2120,7 @@ static void build_subroutines(BuildCtx *ctx) | |||
| 2120 | |2: | 2120 | |2: |
| 2121 | | addiu RC, MULTRES, -8 | 2121 | | addiu RC, MULTRES, -8 |
| 2122 | | jr AT | 2122 | | jr AT |
| 2123 | |. add RA, RA, BASE | 2123 | |. addu RA, RA, BASE |
| 2124 | | | 2124 | | |
| 2125 | |3: // Rethrow error from the right C frame. | 2125 | |3: // Rethrow error from the right C frame. |
| 2126 | | load_got lj_err_throw | 2126 | | load_got lj_err_throw |