diff options
| -rw-r--r-- | include/mruby/value.h | 4 | ||||
| -rw-r--r-- | src/codegen.c | 4 | ||||
| -rw-r--r-- | src/crc.c | 2 | ||||
| -rw-r--r-- | src/opcode.h | 2 | ||||
| -rw-r--r-- | src/string.c | 2 | ||||
| -rw-r--r-- | src/symbol.c | 1 | ||||
| -rw-r--r-- | src/vm.c | 2 |
7 files changed, 8 insertions, 9 deletions
diff --git a/include/mruby/value.h b/include/mruby/value.h index 7f31b0982..eae08855d 100644 --- a/include/mruby/value.h +++ b/include/mruby/value.h @@ -158,8 +158,8 @@ mrb_float_value(mrb_float f) #define MRB_OBJECT_HEADER \ enum mrb_vtype tt:8;\ - unsigned int color:3;\ - unsigned int flags:21;\ + uint32_t color:3;\ + uint32_t flags:21;\ struct RClass *c;\ struct RBasic *gcnext diff --git a/src/codegen.c b/src/codegen.c index ace9697e9..b9b52ad10 100644 --- a/src/codegen.c +++ b/src/codegen.c @@ -541,11 +541,11 @@ for_body(codegen_scope *s, node *tree) // generate loop variable n2 = tree->car; if (n2->car && !n2->car->cdr && !n2->cdr) { - genop(s, MKOP_Ax(OP_ENTER, 1<<18)); + genop(s, MKOP_Ax(OP_ENTER, 0x40000)); gen_assignment(s, n2->car->car, 1, NOVAL); } else { - genop(s, MKOP_Ax(OP_ENTER, 1<<18)); + genop(s, MKOP_Ax(OP_ENTER, 0x40000)); gen_vmassignment(s, n2, 1, VAL); } codegen(s, tree->cdr->cdr->car, VAL); @@ -13,7 +13,7 @@ // carry #define CRC_16_CCITT 0x11021ul //x^16+x^12+x^5+1 #define CRC_XOR_PATTERN (CRC_16_CCITT << 8) -#define CRC_CARRY_BIT (1 << 24) +#define CRC_CARRY_BIT (0x01000000) uint16_t calc_crc_16_ccitt(unsigned char *src, int nbytes) diff --git a/src/opcode.h b/src/opcode.h index d77e2451f..7c2ec204d 100644 --- a/src/opcode.h +++ b/src/opcode.h @@ -7,7 +7,7 @@ #ifndef OPCODE_H #define OPCODE_H -#define MAXARG_Bx ((1<<16)-1) +#define MAXARG_Bx (0xffff) #define MAXARG_sBx (MAXARG_Bx>>1) /* `sBx' is signed */ /* instructions OP:A:B:C = 7:9:9:7 (32 bits) */ diff --git a/src/string.c b/src/string.c index 32daaa3b5..7fefbefb5 100644 --- a/src/string.c +++ b/src/string.c @@ -2050,7 +2050,7 @@ mrb_cstr_to_inum(mrb_state *mrb, const char *str, int base, int badcheck) char *end; char sign = 1; int c; - unsigned int n; + unsigned long n; mrb_int val; #undef ISDIGIT diff --git a/src/symbol.c b/src/symbol.c index 34d274787..1c56af4cf 100644 --- a/src/symbol.c +++ b/src/symbol.c @@ -44,7 +44,6 @@ mrb_intern2(mrb_state *mrb, const char *name, size_t len) mrb_sym sym; char *p; - if (len < 0) len = 0; sname.len = len; sname.name = name; k = kh_get(n2s, h, sname); @@ -45,7 +45,7 @@ /* Maximum stack depth. Should be set lower on memory constrained systems. The value below allows about 60000 recursive calls in the simplest case. */ #ifndef MRB_STACK_MAX -#define MRB_STACK_MAX ((1<<18) - MRB_STACK_GROWTH) +#define MRB_STACK_MAX (0x40000 - MRB_STACK_GROWTH) #endif #ifdef VM_DEBUG |