summaryrefslogtreecommitdiff
path: root/vm.c
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-07-14 07:06:26 +0000
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-07-14 07:06:26 +0000
commite91ae784bc91f5084e617d3a3e00ebd75162427b (patch)
tree59c1e9e17d0a2397c64ba96e4af09928684c7d7a /vm.c
parent944afa18a1973d0db13c320eaefee81d08c5cb4c (diff)
vm_core.h (struct rb_iseq_struct): reduce to 296 bytes on 64-bit
Most iseq do not have a catch_table, so avoid needlessly adding 4-8 bytes to the struct for the common case. Changes from v2: - iseq_catch_table_size removed, use if (...) for (;...;) Changes from v1: - renamed iseq->_catch_table to iseq->catch_table - iseq_catch_table_bytes: made a static inline function - iseq_catch_table_size: new function replaces the iseq_catch_table_each iterator macro * iseq.h (struct iseq_catch_table): new flexible array struct (iseq_catch_table_bytes): allocated size function * vm_core.h (struct rb_iseq_struct): uupdate catch_table member * compile.c (iseq_set_exception_table): update for struct changes * iseq.c (iseq_free): ditto * iseq.c (iseq_memsize): ditto * iseq.c (rb_iseq_disasm): ditto * iseq.c (iseq_data_to_ary): ditto * iseq.c (rb_iseq_build_for_ruby2cext): ditto (untested) * vm.c (vm_exec): ditto * vm_core.h (struct rb_iseq_struct): ditto * vm_insnhelper.c (vm_throw): ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46811 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm.c')
-rw-r--r--vm.c26
1 files changed, 16 insertions, 10 deletions
diff --git a/vm.c b/vm.c
index 0fd5e3f..c33f16a 100644
--- a/vm.c
+++ b/vm.c
@@ -1383,6 +1383,7 @@ vm_exec(rb_thread_t *th)
else {
int i;
struct iseq_catch_table_entry *entry;
+ struct iseq_catch_table *ct;
unsigned long epc, cont_pc, cont_sp;
VALUE catch_iseqval;
rb_control_frame_t *cfp;
@@ -1417,8 +1418,9 @@ vm_exec(rb_thread_t *th)
SET_THROWOBJ_STATE(err, state = TAG_BREAK);
}
else {
- for (i = 0; i < cfp->iseq->catch_table_size; i++) {
- entry = &cfp->iseq->catch_table[i];
+ ct = cfp->iseq->catch_table;
+ if (ct) for (i = 0; i < ct->size; i++) {
+ entry = &ct->entries[i];
if (entry->start < epc && entry->end >= epc) {
if (entry->type == CATCH_TYPE_ENSURE) {
catch_iseqval = entry->iseq;
@@ -1458,8 +1460,9 @@ vm_exec(rb_thread_t *th)
}
if (state == TAG_RAISE) {
- for (i = 0; i < cfp->iseq->catch_table_size; i++) {
- entry = &cfp->iseq->catch_table[i];
+ ct = cfp->iseq->catch_table;
+ if (ct) for (i = 0; i < ct->size; i++) {
+ entry = &ct->entries[i];
if (entry->start < epc && entry->end >= epc) {
if (entry->type == CATCH_TYPE_RESCUE ||
@@ -1473,8 +1476,9 @@ vm_exec(rb_thread_t *th)
}
}
else if (state == TAG_RETRY) {
- for (i = 0; i < cfp->iseq->catch_table_size; i++) {
- entry = &cfp->iseq->catch_table[i];
+ ct = cfp->iseq->catch_table;
+ if (ct) for (i = 0; i < ct->size; i++) {
+ entry = &ct->entries[i];
if (entry->start < epc && entry->end >= epc) {
if (entry->type == CATCH_TYPE_ENSURE) {
@@ -1499,8 +1503,9 @@ vm_exec(rb_thread_t *th)
type = CATCH_TYPE_BREAK;
search_restart_point:
- for (i = 0; i < cfp->iseq->catch_table_size; i++) {
- entry = &cfp->iseq->catch_table[i];
+ ct = cfp->iseq->catch_table;
+ if (ct) for (i = 0; i < ct->size; i++) {
+ entry = &ct->entries[i];
if (entry->start < epc && entry->end >= epc) {
if (entry->type == CATCH_TYPE_ENSURE) {
@@ -1536,8 +1541,9 @@ vm_exec(rb_thread_t *th)
goto search_restart_point;
}
else {
- for (i = 0; i < cfp->iseq->catch_table_size; i++) {
- entry = &cfp->iseq->catch_table[i];
+ ct = cfp->iseq->catch_table;
+ if (ct) for (i = 0; i < ct->size; i++) {
+ entry = &ct->entries[i];
if (entry->start < epc && entry->end >= epc) {
if (entry->type == CATCH_TYPE_ENSURE) {