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

Use INT32_{MAX,MIN} to specify integer ranges.

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2020-11-05 14:19:27 +09:00
parent afba74ff50
commit 4e535080dc
1 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-compiler/core/codegen.c
+6 -16
View File
@@ -2486,24 +2486,18 @@ codegen(codegen_scope *s, node *tree, int val)
if (i < 0) {
if (i == -1) genop_1(s, OP_LOADI__1, cursp());
else if (i >= -0xff) genop_2(s, OP_LOADINEG, cursp(), (uint16_t)-i);
else if (i >= -0x8000) genop_2S(s, OP_LOADI16, cursp(), (uint16_t)i);
#ifdef MRB_INT64
else if (i >= -(int32_t)0x80000000) genop_2SS(s, OP_LOADI32, cursp(), (uint32_t)i);
else if (i >= INT16_MIN) genop_2S(s, OP_LOADI16, cursp(), (uint16_t)i);
else if (i >= INT32_MIN) genop_2SS(s, OP_LOADI32, cursp(), (uint32_t)i);
else goto lit_int;
#else
else genop_2SS(s, OP_LOADI32, cursp(), (uint32_t)i);
#endif
}
else if (i < 8) genop_1(s, OP_LOADI_0 + (uint8_t)i, cursp());
else if (i <= 0xff) genop_2(s, OP_LOADI, cursp(), (uint16_t)i);
else if (i <= 0x7fff) genop_2S(s, OP_LOADI16, cursp(), (uint16_t)i);
else if (i <= 0x7fffffff) genop_2SS(s, OP_LOADI32, cursp(), (uint32_t)i);
else if (i <= INT16_MAX) genop_2S(s, OP_LOADI16, cursp(), (uint16_t)i);
else if (i <= INT32_MAX) genop_2SS(s, OP_LOADI32, cursp(), (uint32_t)i);
else {
int off;
#ifdef MRB_INT64
lit_int:
#endif
off = new_lit(s, mrb_int_value(s->mrb, i));
genop_bs(s, OP_LOADL, cursp(), off);
}
@@ -2563,20 +2557,16 @@ codegen(codegen_scope *s, node *tree, int val)
else if (i >= -0xff) {
genop_2(s, OP_LOADINEG, cursp(), (uint16_t)-i);
}
else if (i >= -0x8000) {
else if (i >= INT16_MIN) {
genop_2S(s, OP_LOADI16, cursp(), (uint16_t)i);
}
#ifdef MRB_INT32
else genop_2SS(s, OP_LOADI32, cursp(), (uint32_t)i);
#else
else if (i >= -0x80000000) {
else if (i >= INT32_MIN) {
genop_2SS(s, OP_LOADI32, cursp(), (uint32_t)i);
}
else {
int off = new_lit(s, mrb_int_value(s->mrb, i));
genop_bs(s, OP_LOADL, cursp(), off);
}
#endif
#ifndef MRB_NO_FLOAT
}
#endif