admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1196 from monaka/pr-use-mrb_aspec

Browse Source 
Cleanup around mrb_code, mrb_aspec.
This commit is contained in:
Yukihiro "Matz" Matsumoto
2013-04-20 15:43:33 -07:00
parent d9d404e3b0 ec4892c7ea
commit 4a311a4760
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/mruby.h
+2 -2
View File
@@ -36,8 +36,8 @@ extern "C" {
#include "mruby/value.h"
typedef int32_t mrb_code;
typedef int32_t mrb_aspec;
typedef uint32_t mrb_code;
typedef uint32_t mrb_aspec;
struct mrb_state;
src/codegen.c
+3 -3
View File
@@ -586,7 +586,7 @@ lambda_body(codegen_scope *s, node *tree, int blk)
}
tree = tree->cdr;
if (tree->car) {
int32_t a;
mrb_aspec a;
int ma, oa, ra, pa, ka, kd, ba;
int pos, i;
node *n, *opt;
@@ -602,8 +602,8 @@ lambda_body(codegen_scope *s, node *tree, int blk)
ka = kd = 0;
ba = tree->car->cdr->cdr->cdr->cdr ? 1 : 0;
a = ((int32_t)(ma & 0x1f) << 18)
| ((int32_t)(oa & 0x1f) << 13)
a = ((mrb_aspec)(ma & 0x1f) << 18)
| ((mrb_aspec)(oa & 0x1f) << 13)
| ((ra & 1) << 12)
| ((pa & 0x1f) << 7)
| ((ka & 0x1f) << 2)
src/vm.c
+1 -1
View File
@@ -1117,7 +1117,7 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)
CASE(OP_ENTER) {
/* Ax arg setup according to flags (24=5:5:1:5:5:1:1) */
/* number of optional arguments times OP_JMP should follow */
int32_t ax = GETARG_Ax(i);
mrb_aspec ax = GETARG_Ax(i);
int m1 = (ax>>18)&0x1f;
int o = (ax>>13)&0x1f;
int r = (ax>>12)&0x1;