Fixed minor syntax error in fib example

Author: hugsy

.gitignore

@@ -18,6 +18,8 @@
 *.pyd
 *.pyc
 
+__pycache__
+
 # Fortran module files
 *.mod
 *.smod

examples/long_mode_fibonacci.py

@@ -1,4 +1,8 @@
-import struct
+#
+# Example: Run in bochscpu Fibonacci sequence in long mode
+# Requires: keystone-engine, capstone
+#
+
 import time
 
 import capstone
@@ -31,27 +35,6 @@ def dbg(x: str):
         print(f"[Py] {x}")
 
 
-def dump_page_table(addr: int, level: int = 0):
-    level_str = ("PML", "PDPT", "PD", "PT")
-    if level == 4:
-        data = bytes(bochscpu.memory.phy_read(addr, 8))
-        entry = struct.unpack("<Q", data[:8])[0] & ~0xFFF
-        print(f"{' '*level} {entry:#x}")
-        return
-
-    print(f"Dumping {level_str[level]} @ {addr:#x}")
-
-    for i in range(0, PAGE_SIZE, 8):
-        data = bytes(bochscpu.memory.phy_read(addr + i, 8))
-        entry = struct.unpack("<Q", data[:8])[0]
-        flags = entry & 0xFFF
-        entry = entry & ~0xFFF
-        if entry == 0:
-            continue
-        print(f"{' '*level} #{i//8} - {hex(entry)}|{flags=:#x}")
-        dump_page_table(entry, level + 1)
-
-
 def missing_page_cb(gpa):
     raise Exception(f"missing_page_cb({gpa=:#x})")
 
@@ -136,10 +119,10 @@ def emulate(code: bytes):
     evaled_gpa = bochscpu.memory.virt_translate(pml4, stack_gva)
     assert evaled_gpa == stack_gpa, f"{evaled_gpa=:#x} != {stack_gpa=:#x}"
 
-    # dump_page_table(pml4)
+    bochscpu.utils.dump_page_table(pml4)
 
     dbg(f"copy code to {shellcode_gva=:#x}")
-    assert bochscpu.memory.virt_write(pml4, shellcode_gva, bytes(code))
+    assert bochscpu.memory.virt_write(pml4, shellcode_gva, bytearray(code))
     dbg(f"copied to {shellcode_gva=:#x}, testing...")
     data = bochscpu.memory.virt_read(pml4, shellcode_gva, len(code))
     assert data

examples/real_mode_print_hello.py

@@ -39,15 +39,15 @@ def phy_access_cb(sess, cpu_id, a2, a3, a4, a5):
 
 
 def reset_cb(sess, a1, a2):
-    print(f"{a1=:} {a2=:}")
+    logging.debug(f"{a1=:} {a2=:}")
 
 
 def interrupt_cb(sess, a1, a2):
-    print(f"{a1=:} {a2=:}")
+    logging.debug(f"{a1=:} {a2=:}")
 
 
 def hw_interrupt_cb(sess, a1, a2, a3, a4):
-    print(f"{a1=:} {a2=:}")
+    logging.debug(f"{a1=:} {a2=:}")
 
 
 def exception_cb(