commit 3d2daa2d03e300ac64005b8659c31f04a0f7fd53
author Damien George <damien.p.george@gmail.com> Sat Jan 02 22:04:12 2016 +0000
committer Damien George <damien.p.george@gmail.com> Sat Jan 02 22:04:12 2016 +0000
tree e27db58705acf353ebc4481602e0f4f25f47f4a4
parent ae4865efa1b4ff4a453bcd5992bf7fdcac69afaa

py: Change exception traceback data to use size_t instead of mp_uint_t.

The traceback array stores qstrs and line numbers.  qstrs are typed as
size_t, and line numbers should safely fit in size_t as well.

py/objexcept.c

diff --git a/py/objexcept.c b/py/objexcept.c
index da31ddd..ffe5ea0 100644
--- a/py/objexcept.c
+++ b/py/objexcept.c
@@ -346,9 +346,9 @@
             offset += sizeof(void *) - 1;
             offset &= ~(sizeof(void *) - 1);
 
-            if ((mp_emergency_exception_buf_size - offset) > (sizeof(mp_uint_t) * 3)) {
+            if ((mp_emergency_exception_buf_size - offset) > (sizeof(o->traceback_data[0]) * 3)) {
                 // We have room to store some traceback.
-                o->traceback_data = (mp_uint_t*)((byte *)MP_STATE_VM(mp_emergency_exception_buf) + offset);
+                o->traceback_data = (size_t*)((byte *)MP_STATE_VM(mp_emergency_exception_buf) + offset);
                 o->traceback_alloc = (MP_STATE_VM(mp_emergency_exception_buf) + mp_emergency_exception_buf_size - (byte *)o->traceback_data) / sizeof(o->traceback_data[0]);
                 o->traceback_len = 0;
             }
@@ -429,14 +429,14 @@
     self->traceback_data = NULL;
 }
 
-void mp_obj_exception_add_traceback(mp_obj_t self_in, qstr file, mp_uint_t line, qstr block) {
+void mp_obj_exception_add_traceback(mp_obj_t self_in, qstr file, size_t line, qstr block) {
     GET_NATIVE_EXCEPTION(self, self_in);
 
     // append this traceback info to traceback data
     // if memory allocation fails (eg because gc is locked), just return
 
     if (self->traceback_data == NULL) {
-        self->traceback_data = m_new_maybe(mp_uint_t, 3);
+        self->traceback_data = m_new_maybe(size_t, 3);
         if (self->traceback_data == NULL) {
             return;
         }
@@ -444,7 +444,7 @@
         self->traceback_len = 0;
     } else if (self->traceback_len + 3 > self->traceback_alloc) {
         // be conservative with growing traceback data
-        mp_uint_t *tb_data = m_renew_maybe(mp_uint_t, self->traceback_data, self->traceback_alloc, self->traceback_alloc + 3, true);
+        size_t *tb_data = m_renew_maybe(size_t, self->traceback_data, self->traceback_alloc, self->traceback_alloc + 3, true);
         if (tb_data == NULL) {
             return;
         }
@@ -452,14 +452,14 @@
         self->traceback_alloc += 3;
     }
 
-    mp_uint_t *tb_data = &self->traceback_data[self->traceback_len];
+    size_t *tb_data = &self->traceback_data[self->traceback_len];
     self->traceback_len += 3;
-    tb_data[0] = (mp_uint_t)file;
-    tb_data[1] = (mp_uint_t)line;
-    tb_data[2] = (mp_uint_t)block;
+    tb_data[0] = file;
+    tb_data[1] = line;
+    tb_data[2] = block;
 }
 
-void mp_obj_exception_get_traceback(mp_obj_t self_in, mp_uint_t *n, mp_uint_t **values) {
+void mp_obj_exception_get_traceback(mp_obj_t self_in, size_t *n, size_t **values) {
     GET_NATIVE_EXCEPTION(self, self_in);
 
     if (self->traceback_data == NULL) {