ElectronixTM/dp32-proto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: подправил читаемость полей виртуальной машины и исправил косяки с памятью

Browse Source
This commit is contained in:
ElectronixTM
2025-03-29 01:05:21 +03:00
parent fe5d51258b
commit f1e083d7bb
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/vm.py
View File

@ -1,7 +1,7 @@
from dataclasses import dataclass, field from dataclasses import dataclass, field
from typing import ClassVar, Callable from typing import ClassVar, Callable
from ctypes import c_uint32, c_int32, c_uint8 from ctypes import c_uint32, c_int32
import struct import struct
from optable import OPCODES, OpcodeDescription, OpL, OpA, OpF, OpD from optable import OPCODES, OpcodeDescription, OpL, OpA, OpF, OpD
from enum import IntFlag, auto from enum import IntFlag, auto
@ -27,8 +27,14 @@ class Breakpoint(Exception):
@dataclass @dataclass
class VM: class VM:
instr_callbacks: ClassVar[dict[OpcodeDescription, Callable]] instr_callbacks: ClassVar[dict[OpcodeDescription, Callable]]
mem: bytearray
cc: VMCC
pc: c_uint32
registers: list[c_int32]
breakpoints: set[int]
_vm_flags: VMFlags
def __init__(self, mem): def __init__(self, mem: bytearray):
self.mem: bytearray = mem self.mem: bytearray = mem
self.cc: VMCC = VMCC(0) self.cc: VMCC = VMCC(0)
self.pc: c_uint32 = c_uint32(0) self.pc: c_uint32 = c_uint32(0)
@ -134,7 +140,7 @@ class VM:
return OPCODES[opcode] return OPCODES[opcode]
def _parse_arguments(self, opdesc: OpcodeDescription) -> tuple[int, ...]: def _parse_arguments(self, opdesc: OpcodeDescription) -> tuple[int, ...]:
addr = self.pc.value addr = self.pc.value * 4
main_part = struct.unpack(">BBBb", self.mem[addr:addr+4]) main_part = struct.unpack(">BBBb", self.mem[addr:addr+4])
if not OpF.UNEXPANDED in opdesc.flags or OpF.QUICK in opdesc.flags: if not OpF.UNEXPANDED in opdesc.flags or OpF.QUICK in opdesc.flags:
@ -243,7 +249,7 @@ class VM:
def _branch_callback(self, cond: int, disp: int) -> None: def _branch_callback(self, cond: int, disp: int) -> None:
c = Condition(cond) c = Condition(cond)
vm_c = Condition(self.cc.value) vm_c = Condition(self.cc)
if (c.v & vm_c.v) & (c.n & vm_c.n) & (c.z & vm_c.z) == c.i: if (c.v & vm_c.v) & (c.n & vm_c.n) & (c.z & vm_c.z) == c.i:
self._vm_flags |= VMFlags.AFTER_BRANCH self._vm_flags |= VMFlags.AFTER_BRANCH
self.pc = c_uint32(self.pc.value + disp) self.pc = c_uint32(self.pc.value + disp)