summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-12 09:02:06 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-12 09:02:06 +0000
commit231d40446da168b1aa99ac6760bc27a9c2dea667 (patch)
tree872758cbe2204a0d7c976897f1eeba5aa6d8aa50
parent2adcd83961a647adc47f0f989e60605f249c4f22 (diff)
downloadruby-231d40446da168b1aa99ac6760bc27a9c2dea667.tar.gz
ruby-231d40446da168b1aa99ac6760bc27a9c2dea667.tar.xz
ruby-231d40446da168b1aa99ac6760bc27a9c2dea667.zip
* vm.c (rb_vm_get_sourceline), vm_insnhelper.c (vm_throw): use
rb_num_t. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@22912 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--vm.c2
-rw-r--r--vm_insnhelper.c2
3 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e261f6422..9b3b130ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,10 @@
-Thu Mar 12 17:56:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Mar 12 18:02:05 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* st.c: use st_index_t for indexes instead of int.
+ * vm.c (rb_vm_get_sourceline), vm_insnhelper.c (vm_throw): use
+ rb_num_t.
+
Thu Mar 12 09:30:54 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (RUBY_CHECK_SIZEOF): if same size type is found, no
diff --git a/vm.c b/vm.c
index a49926bef..17c2697b7 100644
--- a/vm.c
+++ b/vm.c
@@ -672,7 +672,7 @@ rb_vm_get_sourceline(const rb_control_frame_t *cfp)
const rb_iseq_t *iseq = cfp->iseq;
if (RUBY_VM_NORMAL_ISEQ_P(iseq)) {
- int i;
+ rb_num_t i;
int pos = cfp->pc - cfp->iseq->iseq_encoded;
for (i = 0; i < iseq->insn_info_size; i++) {
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index ce1f0984d..5293af316 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -1260,7 +1260,6 @@ vm_throw(rb_thread_t *th, rb_control_frame_t *reg_cfp,
if (state != 0) {
VALUE *pt = 0;
- int i;
if (flag != 0) {
pt = (void *) 1;
}
@@ -1329,6 +1328,7 @@ vm_throw(rb_thread_t *th, rb_control_frame_t *reg_cfp,
}
}
else if (state == TAG_RETRY) {
+ rb_num_t i;
pt = GC_GUARDED_PTR_REF((VALUE *) * GET_DFP());
for (i = 0; i < level; i++) {
pt = GC_GUARDED_PTR_REF((VALUE *) * pt);