skoolkit 10.1__tar.gz → 10.2__tar.gz

{skoolkit-10.1/skoolkit.egg-info → skoolkit-10.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skoolkit
-Version: 10.1
+Version: 10.2
 Summary: A suite of tools for creating disassemblies of ZX Spectrum games
 Home-page: https://skoolkit.ca
 Author: Richard Dymond
@@ -10,11 +10,11 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Topic :: Software Development :: Disassemblers
 Classifier: Topic :: Utilities
 Description-Content-Type: text/x-rst

{skoolkit-10.1 → skoolkit-10.2}/c/csimulator.c

@@ -39,6 +39,20 @@
 #define CHECK_SIGNALS if ((TIME & 0xFFFFFF) < 10) PyErr_CheckSignals()
 #define SCR_LEN 6912
 
+#define GET_OPCODE_FUNC(opcodes) \
+    byte opcode = PEEK(pc); \
+    OpcodeFunction* opcode_func = opcodes[opcode]; \
+    if (!opcode_func->func) { \
+        byte opcode2 = PEEK(ADDR(pc + 1)); \
+        switch (opcode) { \
+            case 0xCB: opcode_func = &after_CB[opcode2]; break; \
+            case 0xED: opcode_func = &after_ED[opcode2]; break; \
+            case 0xDD: opcode_func = opcode2 == 0xCB ? &after_DDCB[PEEK(ADDR(pc + 3))] : &after_DD[opcode2]; break; \
+            case 0xFD: opcode_func = opcode2 == 0xCB ? &after_FDCB[PEEK(ADDR(pc + 3))] : &after_FD[opcode2]; break; \
+            default: break; \
+        } \
+    }
+
 typedef unsigned char byte;
 
 typedef void (*contend_f)(unsigned* t, unsigned* delay, int urc, int n, const unsigned* cpattern);
@@ -1716,7 +1730,7 @@ static void in_a(CSimulatorObject* self, void* lookup, int args[]) {
             value = self->read_port(self, port);
         } else {
             PyObject* m_args = Py_BuildValue("(OI)", self->registers_obj, port);
-            PyObject* rv = PyObject_Call(self->in_a_n_tracer, m_args, NULL);
+            PyObject* rv = m_args ? PyObject_Call(self->in_a_n_tracer, m_args, NULL) : NULL;
             Py_XDECREF(m_args);
             if (rv) {
                 value = PyLong_AsLong(rv);
@@ -1751,7 +1765,7 @@ static void in_c(CSimulatorObject* self, void* lookup, int args[]) {
             value = self->read_port(self, port);
         } else {
             PyObject* m_args = Py_BuildValue("(OI)", self->registers_obj, port);
-            PyObject* rv = PyObject_Call(self->in_r_c_tracer, m_args, NULL);
+            PyObject* rv = m_args ? PyObject_Call(self->in_r_c_tracer, m_args, NULL) : NULL;
             Py_XDECREF(m_args);
             if (rv) {
                 value = PyLong_AsLong(rv);
@@ -1820,7 +1834,7 @@ static void ini(CSimulatorObject* self, void* lookup, int args[]) {
             value = self->read_port(self, port);
         } else {
             PyObject* m_args = Py_BuildValue("(OI)", self->registers_obj, port);
-            PyObject* rv = PyObject_Call(self->ini_tracer, m_args, NULL);
+            PyObject* rv = m_args ? PyObject_Call(self->ini_tracer, m_args, NULL) : NULL;
             Py_XDECREF(m_args);
             if (rv) {
                 value = (byte)PyLong_AsLong(rv);
@@ -2494,7 +2508,7 @@ static void out_a(CSimulatorObject* self, void* lookup, int args[]) {
     OUT(port, value);
     if (self->out_tracer) {
         PyObject* m_args = Py_BuildValue("(OIBI)", self->registers_obj, port, value, 12 + delay);
-        PyObject* rv = PyObject_Call(self->out_tracer, m_args, NULL);
+        PyObject* rv = m_args ? PyObject_Call(self->out_tracer, m_args, NULL) : NULL;
         Py_XDECREF(m_args);
         if (rv == NULL) {
             return;
@@ -2527,7 +2541,7 @@ static void out_c(CSimulatorObject* self, void* lookup, int args[]) {
     OUT(port, value);
     if (self->out_tracer) {
         PyObject* m_args = Py_BuildValue("(OIBI)", self->registers_obj, port, value, 13 + delay);
-        PyObject* rv = PyObject_Call(self->out_tracer, m_args, NULL);
+        PyObject* rv = m_args ? PyObject_Call(self->out_tracer, m_args, NULL) : NULL;
         Py_XDECREF(m_args);
         if (rv == NULL) {
             return;
@@ -2567,7 +2581,7 @@ static void outi(CSimulatorObject* self, void* lookup, int args[]) {
     OUT(port, value);
     if (self->out_tracer) {
         PyObject* m_args = Py_BuildValue("(OIBI)", self->registers_obj, port, value, 17 + io_delay);
-        PyObject* rv = PyObject_Call(self->out_tracer, m_args, NULL);
+        PyObject* rv = m_args ? PyObject_Call(self->out_tracer, m_args, NULL) : NULL;
         Py_XDECREF(m_args);
         if (rv == NULL) {
             return;
@@ -5066,13 +5080,18 @@ static PyObject* convert_memory(PyObject* source) {
         goto done;
     }
     while (mem_ok == 0 && addr < size && (item = PyIter_Next(mem_iter)) != NULL) {
+        long value = 0;
         if (PyLong_Check(item)) {
-            mem[addr] = PyLong_AsLong(item) & 0xFF;
+            value = PyLong_AsLong(item);
+            if (PyErr_Occurred()) {
+                mem_ok = -1;
+            }
         } else {
             PyErr_Format(PyExc_TypeError, "Object at memory address %u is not an integer", addr);
             mem_ok = -1;
         }
         Py_DECREF(item);
+        mem[addr] = value & 0xFF;
         addr += 1;
     }
     Py_DECREF(mem_iter);
@@ -5179,6 +5198,10 @@ static PyObject* CSimulator_set_tracer(CSimulatorObject* self, PyObject* args, P
 
     if (PyObject_HasAttrString(tracer, "read_port")) {
         PyObject* read_port = PyObject_GetAttrString(tracer, "read_port");
+        if (read_port == NULL) {
+            ok = 0;
+            goto done;
+        }
         self->in_a_n_tracer = read_port;
         if (in_r_c) {
             self->in_r_c_tracer = read_port;
@@ -5238,35 +5261,7 @@ static PyObject* CSimulator_run(CSimulatorObject* self, PyObject* args, PyObject
 
     while (1) {
         unsigned pc = REG(PC);
-        byte opcode = PEEK(pc);
-        OpcodeFunction* opcode_func = &opcodes[opcode];
-        if (!opcode_func->func) {
-            byte opcode2 = PEEK(ADDR(pc + 1));
-            switch (opcode) {
-                case 0xCB:
-                    opcode_func = &after_CB[opcode2];
-                    break;
-                case 0xED:
-                    opcode_func = &after_ED[opcode2];
-                    break;
-                case 0xDD:
-                    if (opcode2 == 0xCB) {
-                        opcode_func = &after_DDCB[PEEK(ADDR(pc + 3))];
-                    } else {
-                        opcode_func = &after_DD[opcode2];
-                    }
-                    break;
-                case 0xFD:
-                    if (opcode2 == 0xCB) {
-                        opcode_func = &after_FDCB[PEEK(ADDR(pc + 3))];
-                    } else {
-                        opcode_func = &after_FD[opcode2];
-                    }
-                    break;
-                default:
-                    break;
-            }
-        }
+        GET_OPCODE_FUNC(&opcodes);
 
         opcode_func->func(self, opcode_func->lookup, opcode_func->args);
         if (PyErr_Occurred()) {
@@ -5300,35 +5295,8 @@ static PyObject* CSimulator_exec_with_cb(CSimulatorObject* self, PyObject* args,
     byte* mem = self->memory;
 
     while (1) {
-        byte opcode = PEEK(REG(PC));
-        OpcodeFunction* opcode_func = &opcodes[opcode];
-        if (!opcode_func->func) {
-            byte opcode2 = PEEK(ADDR(REG(PC) + 1));
-            switch (opcode) {
-                case 0xCB:
-                    opcode_func = &after_CB[opcode2];
-                    break;
-                case 0xED:
-                    opcode_func = &after_ED[opcode2];
-                    break;
-                case 0xDD:
-                    if (opcode2 == 0xCB) {
-                        opcode_func = &after_DDCB[PEEK(ADDR(REG(PC) + 3))];
-                    } else {
-                        opcode_func = &after_DD[opcode2];
-                    }
-                    break;
-                case 0xFD:
-                    if (opcode2 == 0xCB) {
-                        opcode_func = &after_FDCB[PEEK(ADDR(REG(PC) + 3))];
-                    } else {
-                        opcode_func = &after_FD[opcode2];
-                    }
-                    break;
-                default:
-                    break;
-            }
-        }
+        unsigned pc = REG(PC);
+        GET_OPCODE_FUNC(&opcodes);
 
         opcode_func->func(self, opcode_func->lookup, opcode_func->args);
         if (PyErr_Occurred()) {
@@ -5337,7 +5305,7 @@ static PyObject* CSimulator_exec_with_cb(CSimulatorObject* self, PyObject* args,
 
         if (opcode == 0xD7) {
             PyObject* arg = PyLong_FromLong(REG(A));
-            PyObject* rv = PyObject_CallOneArg(rst16_cb, arg);
+            PyObject* rv = arg ? PyObject_CallOneArg(rst16_cb, arg) : NULL;
             Py_XDECREF(arg);
             if (rv == NULL) {
                 return NULL;
@@ -5363,65 +5331,20 @@ static PyObject* CSimulator_exec_frame(CSimulatorObject* self, PyObject* args, P
         return NULL;
     }
 
+    if (exec_map != Py_None && !PySet_Check(exec_map)) {
+        PyErr_SetString(PyExc_TypeError, "'exec_map' is not a set");
+        return NULL;
+    }
+
     unsigned long long* reg = self->registers;
     byte* mem = self->memory;
     unsigned pc;
 
     while (1) {
         pc = REG(PC);
-        byte opcode = PEEK(pc);
-        byte opcode2 = PEEK(ADDR(pc + 1));
-        OpcodeFunction* opcode_func = &opcodes[opcode];
-        unsigned r0;
-        unsigned r_inc = 1;
-        if (!opcode_func->func) {
-            switch (opcode) {
-                case 0xCB: {
-                    r_inc = 2;
-                    opcode_func = &after_CB[opcode2];
-                    break;
-                }
-                case 0xED: {
-                    r_inc = 2;
-                    opcode_func = &after_ED[opcode2];
-                    break;
-                }
-                case 0xDD: {
-                    r0 = REG(R);
-                    if (opcode2 == 0xCB) {
-                        r_inc = 2;
-                        opcode_func = &after_DDCB[PEEK(ADDR(REG(PC) + 3))];
-                    } else {
-                        r_inc = 0;
-                        opcode_func = &after_DD[opcode2];
-                    }
-                    break;
-                }
-                case 0xFD: {
-                    r0 = REG(R);
-                    if (opcode2 == 0xCB) {
-                        r_inc = 2;
-                        opcode_func = &after_FDCB[PEEK(ADDR(REG(PC) + 3))];
-                    } else {
-                        r_inc = 0;
-                        opcode_func = &after_FD[opcode2];
-                    }
-                    break;
-                }
-                default:
-                    break;
-            }
-        }
-
-        if (trace != Py_None) {
-            PyObject* m_args = Py_BuildValue("(II)", fetch_count, pc);
-            PyObject* rv = PyObject_Call(trace, m_args, NULL);
-            Py_XDECREF(m_args);
-            if (rv == NULL) {
-                return NULL;
-            }
-            Py_DECREF(rv);
-        }
+        unsigned long long t0 = TIME;
+        unsigned r0 = REG(R);
+        GET_OPCODE_FUNC(&opcodes);
 
         opcode_func->func(self, opcode_func->lookup, opcode_func->args);
         if (PyErr_Occurred()) {
@@ -5430,17 +5353,23 @@ static PyObject* CSimulator_exec_frame(CSimulatorObject* self, PyObject* args, P
 
         if (exec_map != Py_None) {
             PyObject* addr = PyLong_FromLong(pc);
-            int rv = PySet_Add(exec_map, addr);
+            int rv = addr ? PySet_Add(exec_map, addr) : -1;
             Py_XDECREF(addr);
             if (rv == -1) {
                 return NULL;
             }
         }
 
-        if (r_inc) {
-            fetch_count -= r_inc;
-        } else {
-            fetch_count -= 2 - ((REG(R) ^ r0) & 1);
+        fetch_count -= opcode == 0xED ? 2 : 2 - ((REG(R) ^ r0) & 1);
+
+        if (trace != Py_None) {
+            PyObject* m_args = Py_BuildValue("(IIK)", fetch_count, pc, t0);
+            PyObject* rv = m_args ? PyObject_Call(trace, m_args, NULL) : NULL;
+            Py_XDECREF(m_args);
+            if (rv == NULL) {
+                return NULL;
+            }
+            Py_DECREF(rv);
         }
 
         if (fetch_count <= 0) {
@@ -5485,6 +5414,11 @@ static PyObject* CSimulator_trace(CSimulatorObject* self, PyObject* args, PyObje
         return NULL;
     }
 
+    if (exec_map != Py_None && !PySet_Check(exec_map)) {
+        PyErr_SetString(PyExc_TypeError, "'exec_map' is not a set");
+        return NULL;
+    }
+
     if (self->tracer == NULL) {
         PyErr_SetString(PyExc_ValueError, "no tracer set");
         return NULL;
@@ -5512,39 +5446,11 @@ static PyObject* CSimulator_trace(CSimulatorObject* self, PyObject* args, PyObje
         unsigned long long t0 = TIME;
         unsigned long long prev_frame = t0 / frame_duration;
         unsigned pc = REG(PC);
-        byte opcode = PEEK(pc);
-        OpcodeFunction* opcode_func = &opcodes[opcode];
-        if (!opcode_func->func) {
-            byte opcode2 = PEEK(ADDR(pc + 1));
-            switch (opcode) {
-                case 0xCB:
-                    opcode_func = &after_CB[opcode2];
-                    break;
-                case 0xED:
-                    opcode_func = &after_ED[opcode2];
-                    break;
-                case 0xDD:
-                    if (opcode2 == 0xCB) {
-                        opcode_func = &after_DDCB[PEEK(ADDR(pc + 3))];
-                    } else {
-                        opcode_func = &after_DD[opcode2];
-                    }
-                    break;
-                case 0xFD:
-                    if (opcode2 == 0xCB) {
-                        opcode_func = &after_FDCB[PEEK(ADDR(pc + 3))];
-                    } else {
-                        opcode_func = &after_FD[opcode2];
-                    }
-                    break;
-                default:
-                    break;
-            }
-        }
+        GET_OPCODE_FUNC(&opcodes);
 
         if (disassembling) {
             PyObject* arg = PyLong_FromLong(pc);
-            i = PyObject_CallOneArg(disassemble, arg);
+            i = arg ? PyObject_CallOneArg(disassemble, arg) : NULL;
             Py_XDECREF(arg);
             if (i == NULL) {
                 return NULL;
@@ -5559,7 +5465,7 @@ static PyObject* CSimulator_trace(CSimulatorObject* self, PyObject* args, PyObje
 
         if (exec_map != Py_None) {
             PyObject* addr = PyLong_FromLong(pc);
-            int rv = PySet_Add(exec_map, addr);
+            int rv = addr ? PySet_Add(exec_map, addr) : -1;
             Py_XDECREF(addr);
             if (rv == -1) {
                 Py_XDECREF(i);
@@ -5632,6 +5538,11 @@ static PyObject* CSimulator_press_keys(CSimulatorObject* self, PyObject* args, P
         return NULL;
     }
 
+    if (!PyList_Check(keys)) {
+        PyErr_SetString(PyExc_TypeError, "'keys' is not a list");
+        return NULL;
+    }
+
     PyObject* border = PyObject_GetAttrString(self->tracer, "border");
     if (border == NULL) {
         return NULL;
@@ -5655,39 +5566,11 @@ static PyObject* CSimulator_press_keys(CSimulatorObject* self, PyObject* args, P
         PyObject* i = NULL;
         unsigned pc = REG(PC);
         unsigned long long t0 = TIME;
-        byte opcode = PEEK(pc);
-        OpcodeFunction* opcode_func = &opcodes[opcode];
-        if (!opcode_func->func) {
-            byte opcode2 = PEEK(ADDR(pc + 1));
-            switch (opcode) {
-                case 0xCB:
-                    opcode_func = &after_CB[opcode2];
-                    break;
-                case 0xED:
-                    opcode_func = &after_ED[opcode2];
-                    break;
-                case 0xDD:
-                    if (opcode2 == 0xCB) {
-                        opcode_func = &after_DDCB[PEEK(ADDR(pc + 3))];
-                    } else {
-                        opcode_func = &after_DD[opcode2];
-                    }
-                    break;
-                case 0xFD:
-                    if (opcode2 == 0xCB) {
-                        opcode_func = &after_FDCB[PEEK(ADDR(pc + 3))];
-                    } else {
-                        opcode_func = &after_FD[opcode2];
-                    }
-                    break;
-                default:
-                    break;
-            }
-        }
+        GET_OPCODE_FUNC(&opcodes);
 
         if (disassembling) {
             PyObject* arg = PyLong_FromLong(pc);
-            i = PyObject_CallOneArg(disassemble, arg);
+            i = arg ? PyObject_CallOneArg(disassemble, arg) : NULL;
             Py_XDECREF(arg);
             if (i == NULL) {
                 ok = 0;
@@ -5722,7 +5605,7 @@ static PyObject* CSimulator_press_keys(CSimulatorObject* self, PyObject* args, P
                 }
                 if (!PyObject_IsTrue(k)) {
                     PyObject* arg = PyLong_FromLong(0);
-                    PyObject* p = PyObject_CallOneArg(pop, arg);
+                    PyObject* p = arg ? PyObject_CallOneArg(pop, arg) : NULL;
                     Py_XDECREF(arg);
                     if (p == NULL) {
                         ok = 0;
@@ -5773,6 +5656,11 @@ static PyObject* CSimulator_press(CSimulatorObject* self, PyObject* args, PyObje
         return NULL;
     }
 
+    if (!PyList_Check(keys)) {
+        PyErr_SetString(PyExc_TypeError, "'keys' is not a list");
+        return NULL;
+    }
+
     PyObject* border = PyObject_GetAttrString(self->tracer, "border");
     if (border == NULL) {
         return NULL;
@@ -5790,39 +5678,11 @@ static PyObject* CSimulator_press(CSimulatorObject* self, PyObject* args, PyObje
         PyObject* i = NULL;
         unsigned pc = REG(PC);
         unsigned long long t0 = TIME;
-        byte opcode = PEEK(pc);
-        OpcodeFunction* opcode_func = &opcodes[opcode];
-        if (!opcode_func->func) {
-            byte opcode2 = PEEK(ADDR(pc + 1));
-            switch (opcode) {
-                case 0xCB:
-                    opcode_func = &after_CB[opcode2];
-                    break;
-                case 0xED:
-                    opcode_func = &after_ED[opcode2];
-                    break;
-                case 0xDD:
-                    if (opcode2 == 0xCB) {
-                        opcode_func = &after_DDCB[PEEK(ADDR(pc + 3))];
-                    } else {
-                        opcode_func = &after_DD[opcode2];
-                    }
-                    break;
-                case 0xFD:
-                    if (opcode2 == 0xCB) {
-                        opcode_func = &after_FDCB[PEEK(ADDR(pc + 3))];
-                    } else {
-                        opcode_func = &after_FD[opcode2];
-                    }
-                    break;
-                default:
-                    break;
-            }
-        }
+        GET_OPCODE_FUNC(&opcodes);
 
         if (disassembling) {
             PyObject* arg = PyLong_FromLong(pc);
-            i = PyObject_CallOneArg(disassemble, arg);
+            i = arg ? PyObject_CallOneArg(disassemble, arg) : NULL;
             Py_XDECREF(arg);
             if (i == NULL) {
                 ok = 0;
@@ -6004,6 +5864,9 @@ static int get_tsl_accelerators(PyObject* accelerators, tsl_accelerator* accs) {
         if (name == NULL || code_obj == NULL || c0_obj == NULL || c1_obj == NULL || counter_obj == NULL || inc_obj == NULL ||
             loop_time_obj == NULL || loop_r_inc_obj == NULL || ear_obj == NULL || ear_mask_obj == NULL || polarity_obj == NULL) {
             ok = 0;
+        } else if (!PyList_Check(code_obj)) {
+            PyErr_SetString(PyExc_TypeError, "accelerator code is not a list");
+            ok = 0;
         } else {
             accelerator->c0 = PyLong_AsLong(c0_obj);
             accelerator->c1 = PyLong_AsLong(c1_obj);
@@ -6067,9 +5930,9 @@ static unsigned read_port(CSimulatorObject* self, unsigned port) {
                 self->tracer_state[8] = ((TIME + self->frame_duration - self->int_active) / self->frame_duration) * self->frame_duration;
                 self->tracer_state[9] = 0;
                 PyObject* blocks_obj = PyObject_GetAttrString(self->tracer, "blocks");
-                PyObject* block_index_obj = PyObject_GetAttrString(self->tracer, "block_index");
-                PyObject* block = PyList_GetItem(blocks_obj, PyLong_AsLong(block_index_obj));
-                PyObject* data = PyObject_GetAttrString(block, "data");
+                PyObject* block_index_obj = blocks_obj ? PyObject_GetAttrString(self->tracer, "block_index") : NULL;
+                PyObject* block = block_index_obj ? PyList_GetItem(blocks_obj, PyLong_AsLong(block_index_obj)) : NULL;
+                PyObject* data = block ? PyObject_GetAttrString(block, "data") : NULL;
                 Py_ssize_t len = PyBytes_Check(data) ? PyBytes_Size(data) : 0;
                 Py_XDECREF(data);
                 Py_XDECREF(block_index_obj);
@@ -6142,7 +6005,7 @@ static unsigned read_port(CSimulatorObject* self, unsigned port) {
         }
     } else if ((port & 0xC002) == 0xC000) {
         PyObject* outfffd_obj = PyObject_GetAttrString(self->tracer, "outfffd");
-        unsigned ay_reg = PyLong_AsLong(outfffd_obj);
+        unsigned ay_reg = outfffd_obj ? PyLong_AsLong(outfffd_obj) : 0xFF;
         Py_XDECREF(outfffd_obj);
         if (ay_reg == 14 && REG(PC) == 0x08B2) {
             /* Avoid an infinite loop at 0x08AF in the 128K ROM:
@@ -6154,9 +6017,9 @@ static unsigned read_port(CSimulatorObject* self, unsigned port) {
         }
         if (ay_reg < 16) {
             PyObject* ay = PyObject_GetAttrString(self->tracer, "ay");
-            PyObject* value = PyList_GetItem(ay, ay_reg);
+            PyObject* value = ay ? PyList_GetItem(ay, ay_reg) : NULL;
             Py_XDECREF(ay);
-            return PyLong_AsLong(value);
+            return value ? PyLong_AsLong(value) : 0xFF;
         }
     }
 
@@ -6340,39 +6203,11 @@ static PyObject* CSimulator_load(CSimulatorObject* self, PyObject* args, PyObjec
     while (1) {
         PyObject* i = NULL;
         unsigned long long t0 = TIME;
-        byte opcode = PEEK(pc);
-        OpcodeFunction* opcode_func = self->opcodes[opcode];
-        if (!opcode_func->func) {
-            byte opcode2 = PEEK(ADDR(pc + 1));
-            switch (opcode) {
-                case 0xCB:
-                    opcode_func = &after_CB[opcode2];
-                    break;
-                case 0xED:
-                    opcode_func = &after_ED[opcode2];
-                    break;
-                case 0xDD:
-                    if (opcode2 == 0xCB) {
-                        opcode_func = &after_DDCB[PEEK(ADDR(pc + 3))];
-                    } else {
-                        opcode_func = &after_DD[opcode2];
-                    }
-                    break;
-                case 0xFD:
-                    if (opcode2 == 0xCB) {
-                        opcode_func = &after_FDCB[PEEK(ADDR(pc + 3))];
-                    } else {
-                        opcode_func = &after_FD[opcode2];
-                    }
-                    break;
-                default:
-                    break;
-            }
-        }
+        GET_OPCODE_FUNC(self->opcodes);
 
         if (disassembling) {
             PyObject* arg = PyLong_FromLong(pc);
-            i = PyObject_CallOneArg(disassemble, arg);
+            i = arg ? PyObject_CallOneArg(disassemble, arg) : NULL;
             Py_XDECREF(arg);
             if (i == NULL) {
                 break;
@@ -6503,29 +6338,36 @@ cleanup:
             PyObject* item;
             while ((item = PyIter_Next(iter)) != NULL) {
                 PyObject* name = PyObject_GetAttrString(item, "name");
-                for (int i = 0; i < num_accs; i++) {
-                    tsl_accelerator* acc = &accs[i];
-                    if (acc->name == name) {
-                        if (acc->hits) {
-                            PyObject* hits = PyLong_FromLong(acc->hits);
-                            if (PyObject_SetAttrString(item, "hits", hits) == -1) {
-                                ok = 0;
+                if (name) {
+                    for (int i = 0; i < num_accs; i++) {
+                        tsl_accelerator* acc = &accs[i];
+                        if (acc->name == name) {
+                            if (acc->hits) {
+                                PyObject* hits = PyLong_FromLong(acc->hits);
+                                if (PyObject_SetAttrString(item, "hits", hits) == -1) {
+                                    ok = 0;
+                                }
+                                Py_XDECREF(hits);
                             }
-                            Py_XDECREF(hits);
+                            break;
                         }
-                        break;
                     }
+                } else {
+                    ok = 0;
                 }
                 Py_XDECREF(name);
                 Py_DECREF(item);
+                if (!ok) break;
             }
             Py_DECREF(iter);
         }
-        PyObject* tsl_misses = PyLong_FromLong(self->tsl_misses);
-        PyObject* dec_a_jr_hits = PyLong_FromLong(dec_a_accelerator.args[0]);
-        PyObject* dec_a_jp_hits = PyLong_FromLong(dec_a_accelerator.args[1]);
-        PyObject* dec_a_misses = PyLong_FromLong(dec_a_accelerator.args[2]);
-        if (PyObject_SetAttrString(self->tracer, "tsl_misses", tsl_misses) == -1 ||
+        PyObject* tsl_misses = ok ? PyLong_FromLong(self->tsl_misses) : NULL;
+        PyObject* dec_a_jr_hits = tsl_misses ? PyLong_FromLong(dec_a_accelerator.args[0]) : NULL;
+        PyObject* dec_a_jp_hits = dec_a_jr_hits ? PyLong_FromLong(dec_a_accelerator.args[1]) : NULL;
+        PyObject* dec_a_misses = dec_a_jp_hits ? PyLong_FromLong(dec_a_accelerator.args[2]) : NULL;
+        ok = dec_a_misses != NULL;
+        if (!ok ||
+            PyObject_SetAttrString(self->tracer, "tsl_misses", tsl_misses) == -1 ||
             PyObject_SetAttrString(self->tracer, "dec_a_jr_hits", dec_a_jr_hits) == -1 ||
             PyObject_SetAttrString(self->tracer, "dec_a_jp_hits", dec_a_jp_hits) == -1 ||
             PyObject_SetAttrString(self->tracer, "dec_a_misses", dec_a_misses) == -1) {

{skoolkit-10.1 → skoolkit-10.2}/docs/_sources/asm.rst.txt

@@ -18,7 +18,7 @@ modes are described in the following subsections.
 
 @isub mode
 ^^^^^^^^^^
-In ``@isub`` mode, ``@isub`` directives are executed, but ``@ssub``, and
+In ``@isub`` mode, ``@isub`` directives are executed, but ``@ssub`` and
 ``@rsub`` directives are not. The main purpose of ``@isub`` mode is to make the
 minimum number of instruction substitutions necessary to produce an ASM file
 that assembles.