pyboy 2.7.0__tar.gz → 2.7.1__tar.gz

{pyboy-2.7.0/pyboy.egg-info → pyboy-2.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyboy
-Version: 2.7.0
+Version: 2.7.1
 Summary: Game Boy emulator written in Python
 Author-email: Mads Ynddal <mads@ynddal.dk>
 License-Expression: LGPL-3.0-only

{pyboy-2.7.0 → pyboy-2.7.1}/pyboy/__main__.py

@@ -187,6 +187,7 @@ The other controls for the emulator:
 | X            | Load state              |
 | I            | Toggle screen recording |
 | O            | Save screenshot         |
+| C            | Cycle DMG palette       |
 | ,            | Rewind backwards        |
 | .            | Rewind forward          |
 | J            | Memory Window + 0x100   |

{pyboy-2.7.0 → pyboy-2.7.1}/pyboy/core/bootrom.py

@@ -10,16 +10,15 @@ import struct
 
 class BootROM:
     def __init__(self, bootrom_file, cartridge_cgb):
+        self.cgb = False
         if bootrom_file is None:
             # Default to PyBoy boot ROM
             rom = "/bootrom_cgb.bin" if cartridge_cgb else "/bootrom_dmg.bin"
             bootrom_file = os.path.dirname(os.path.realpath(__file__)) + rom
+            self.cgb = cartridge_cgb
 
         with open(bootrom_file, "rb") as f:
             rom = f.read()
 
         self.bootrom = array.array("B", struct.unpack("%iB" % len(rom), rom))
-        self.cgb = len(rom) > 0x100
-
-    # def getitem(self, addr):
-    #     return
+        self.cgb |= len(rom) > 0x100

{pyboy-2.7.0 → pyboy-2.7.1}/pyboy/core/cpu.pxd

@@ -23,7 +23,7 @@ cdef int16_t FLAGC, FLAGH, FLAGN, FLAGZ
 cdef uint8_t INTR_VBLANK, INTR_LCDC, INTR_TIMER, INTR_SERIAL, INTR_HIGHTOLOW
 
 
-
+@cython.final
 cdef class CPU:
     cdef bint interrupt_master_enable, interrupt_queued, halted, stopped, bail
 
@@ -32,6 +32,8 @@ cdef class CPU:
     cdef int64_t cycles
 
     cdef inline int check_interrupts(self) noexcept nogil
+
+    @cython.final
     cdef void set_interruptflag(self, int) noexcept nogil
     cdef bint handle_interrupt(self, uint8_t, uint16_t) noexcept nogil
 
@@ -52,4 +54,4 @@ cdef class CPU:
 
     cdef pyboy.core.mb.Motherboard mb
 
-    cdef str dump_state(self, str) with gil
+    cdef str dump_state(self, list) with gil

{pyboy-2.7.0 → pyboy-2.7.1}/pyboy/core/cpu.py

@@ -68,9 +68,9 @@ class CPU:
             self.interrupts_flag_register = f.read()
         if state_version >= 12:
             self.cycles = f.read_64bit()
-        logger.debug("State loaded: %s", self.dump_state(""))
+        logger.debug("State loaded: %s", self.dump_state([""]))
 
-    def dump_state(self, sym_label):
+    def dump_state(self, sym_labels):
         opcode_data = [
             self.mb.getitem(self.mb.cpu.PC + n) for n in range(3)
         ]  # Max 3 length, then we don't need to backtrack
@@ -87,7 +87,7 @@ class CPU:
             "\n"
             f"A: {self.mb.cpu.A:02X}, F: {self.mb.cpu.F:02X}, B: {self.mb.cpu.B:02X}, "
             f"C: {self.mb.cpu.C:02X}, D: {self.mb.cpu.D:02X}, E: {self.mb.cpu.E:02X}, "
-            f"HL: {self.mb.cpu.HL:04X}, SP: {self.mb.cpu.SP:04X}, PC: {self.mb.cpu.PC:04X} ({sym_label})\n"
+            f"HL: {self.mb.cpu.HL:04X}, SP: {self.mb.cpu.SP:04X}, PC: {self.mb.cpu.PC:04X} ({', '.join(sym_labels)})\n"
             f"{opcode_str} "
             f"Interrupts - IME: {self.mb.cpu.interrupt_master_enable}, "
             f"IE: {self.mb.cpu.interrupts_enabled_register:08b}, "

{pyboy-2.7.0 → pyboy-2.7.1}/pyboy/core/interaction.pxd

@@ -3,6 +3,7 @@
 # GitHub: https://github.com/Baekalfen/PyBoy
 #
 
+from cython cimport final
 from libc.stdint cimport uint8_t
 
 from pyboy.logging.logging cimport Logger
@@ -16,6 +17,7 @@ cdef uint8_t reset_bit(uint8_t, uint8_t) noexcept
 cdef uint8_t set_bit(uint8_t, uint8_t) noexcept
 
 
+@final
 cdef class Interaction:
     cdef uint8_t directional, standard
     cdef bint key_event(self, WindowEvent) noexcept

{pyboy-2.7.0 → pyboy-2.7.1}/pyboy/core/lcd.pxd

@@ -4,6 +4,7 @@
 #
 
 import cython
+from cython cimport final
 
 from cpython.array cimport array
 from libc.stdint cimport int16_t, int64_t, uint8_t, uint16_t, uint32_t, uint64_t
@@ -25,6 +26,7 @@ cdef Logger logger
 @cython.locals(a=uint32_t, r=uint32_t, g=uint32_t, b=uint32_t)
 cpdef uint32_t rgb_to_bgr(uint32_t) noexcept
 
+@final
 cdef class LCD:
     cdef bint disable_renderer
     cdef uint8_t[8 * 1024] VRAM0
@@ -34,6 +36,7 @@ cdef class LCD:
     cdef uint8_t SCX
     cdef uint8_t WY
     cdef uint8_t WX
+    cdef uint8_t object_priority_mode
     cdef uint8_t next_stat_mode
     cdef bint frame_done
     cdef bint first_frame
@@ -52,21 +55,29 @@ cdef class LCD:
     cdef uint64_t last_cycles
     cdef int64_t _cycles_to_interrupt, _cycles_to_frame
 
+    @final
+    cdef void switch_cgb(self, bint) noexcept with gil
+
+    @final
     @cython.locals(interrupt_flag=uint8_t,bx=int,by=int,wx=int,wy=int)
     cdef uint8_t tick(self, uint64_t) noexcept nogil
 
+    @final
     cdef void set_lcdc(self, uint8_t) noexcept nogil
 
+    @final
     cdef int64_t cycles_to_mode0(self) noexcept nogil
 
     cdef int save_state(self, IntIOInterface) except -1
     cdef int load_state(self, IntIOInterface, int) except -1
 
+    @final
     cdef inline (int, int) getwindowpos(self) noexcept nogil
+    @final
     cdef inline (int, int) getviewport(self) noexcept nogil
 
     # CGB
-    cdef bint cgb
+    cdef bint cgb, _downgraded_to_dmg
     cdef uint8_t speed_shift
     cdef uint8_t[8 * 1024] VRAM1
     cdef VBKregister vbk
@@ -75,29 +86,40 @@ cdef class LCD:
     cdef PaletteIndexRegister ocps
     cdef PaletteColorRegister ocpd
 
-
+@final
 cdef class PaletteRegister:
     cdef uint8_t value
     cdef uint32_t[4] lookup
     cdef uint32_t[4] palette_mem_rgb
 
+    @final
     @cython.locals(x=uint16_t)
     cdef bint set(self, uint64_t) noexcept nogil
+    @final
+    cdef inline void _update_lookup(self) noexcept nogil
+    @final
     cdef uint8_t get(self) noexcept nogil
+    @final
     cdef inline uint32_t getcolor(self, uint8_t) noexcept nogil
 
+@final
 cdef class STATRegister:
     cdef uint8_t value
     cdef uint8_t _mode
+    @final
     cdef uint8_t set_mode(self, uint8_t) noexcept nogil
+    @final
     cdef uint8_t update_LYC(self, uint8_t, uint8_t) noexcept nogil
+    @final
     cdef void set(self, uint64_t) noexcept nogil
     cdef int save_state(self, IntIOInterface) except -1
     cdef int load_state(self, IntIOInterface, int) except -1
 
+@final
 cdef class LCDCRegister:
     cdef uint8_t value
 
+    @final
     cdef void set(self, uint64_t) noexcept nogil
 
     cdef bint lcd_enable
@@ -113,7 +135,9 @@ cdef class LCDCRegister:
     cdef uint16_t backgroundmap_offset
     cdef uint16_t windowmap_offset
 
+@final
 cdef class Renderer:
+    cdef LCD lcd
     cdef uint8_t[:] _tilecache_state, _spritecache_state
     cdef str color_format
     cdef tuple buffer_dims
@@ -131,9 +155,10 @@ cdef class Renderer:
 
     cdef int[10] sprites_to_render
     cdef int ly_window
+    cdef bint wy_activated_frame
     cdef void invalidate_tile(self, int, int) noexcept nogil
 
-    cdef void blank_screen(self, LCD) noexcept nogil
+    cdef void blank_screen(self) noexcept nogil
 
     @cython.locals(
         bx=int,
@@ -152,16 +177,44 @@ cdef class Renderer:
         col0=uint8_t,
         pixel=uint32_t,
     )
-    cdef void scanline(self, LCD, int) noexcept nogil
+    cdef void scanline(self, int) noexcept nogil
+    @cython.locals(
+        bx=int,
+        by=int,
+        wx=int,
+        wy=int,
+        palette=uint8_t,
+        vbank=bint,
+        horiflip=bint,
+        vertflip=bint,
+        bg_priority=bint,
+        xx=int,
+        yy=int,
+        tilecache=uint8_t[:,:],
+        bg_priority_apply=uint32_t,
+        col0=uint8_t,
+        pixel=uint32_t,
+    )
+    cdef void cgb_scanline(self, int) noexcept nogil
 
+    @cython.locals(
+        tile_num = uint8_t,
+        palette = uint8_t,
+        vbank = uint8_t,
+        horiflip = uint8_t,
+        vertflip = uint8_t,
+        bg_priority = uint8_t,
+    )
+    cdef inline (int, int, int, int, int) _cgb_get_background_map_attributes(self, LCD, int) noexcept nogil
     @cython.locals(tile_addr=uint64_t, tile=int)
     cdef inline (int, int, uint16_t) _get_tile(self, uint8_t, uint8_t, uint16_t, LCD) noexcept nogil
+    cdef inline (int, int, uint8_t, bint, uint32_t, bint) _cgb_get_tile(self, uint8_t, uint8_t, uint16_t, LCD) noexcept nogil
     @cython.locals(col0=uint8_t)
     cdef inline void _pixel(self, int, uint32_t, int, int, int, int, uint32_t) noexcept nogil
-    @cython.locals(tilecache=uint8_t[:,:])
     cdef int scanline_background(self, int, int, int, int, int, LCD) noexcept nogil
-    @cython.locals(tilecache=uint8_t[:,:])
     cdef int scanline_window(self, int, int, int, int, int, LCD) noexcept nogil
+    cdef int cgb_scanline_background(self, int, int, int, int, int, LCD) noexcept nogil
+    cdef int cgb_scanline_window(self, int, int, int, int, int, LCD) noexcept nogil
     cdef int scanline_blank(self, int, int, int, LCD) noexcept nogil
 
     @cython.locals(
@@ -187,12 +240,13 @@ cdef class Renderer:
         bgmappriority=bint,
         sprite_cache_no=int,
     )
-    cdef void scanline_sprites(self, LCD, int, uint32_t[:,:], uint8_t[:,:], bint) noexcept nogil
+    cdef void scanline_sprites(self, int, uint32_t[:,:], uint8_t[:,:], bint) noexcept nogil
     cdef void sort_sprites(self, int) noexcept nogil
 
     cdef void clear_cache(self) noexcept nogil
     cdef void clear_tilecache(self, int) noexcept nogil
     cdef void clear_spritecache(self, int) noexcept nogil
+    # @final
     @cython.locals(
         x=int,
         t=int,
@@ -204,6 +258,7 @@ cdef class Renderer:
         colorcode_high=uint64_t,
     )
     cdef void update_tilecache(self, int, LCD, int, int) noexcept nogil
+    # @final
     @cython.locals(
         x=int,
         t=int,
@@ -222,35 +277,14 @@ cdef class Renderer:
     cdef int save_state(self, IntIOInterface) except -1
     cdef int load_state(self, IntIOInterface, int) except -1
 
-
-cdef class CGBLCD(LCD):
-    pass
-    # cdef uint8_t[8 * 1024] VRAM1
-    # cdef VBKregister vbk
-    # cdef PaletteIndexRegister bcps
-    # cdef PaletteColorRegister bcpd
-    # cdef PaletteIndexRegister ocps
-    # cdef PaletteColorRegister ocpd
-
-cdef class CGBRenderer(Renderer):
-
-    @cython.locals(
-        tile_num = uint8_t,
-        palette = uint8_t,
-        vbank = uint8_t,
-        horiflip = uint8_t,
-        vertflip = uint8_t,
-        bg_priority = uint8_t,
-    )
-    cdef inline (int, int, int, int, int) _cgb_get_background_map_attributes(self, LCD, int) noexcept nogil
-    cdef inline (int, int, uint8_t, bint, uint32_t, bint) _get_tile_cgb(self, uint8_t, uint8_t, uint16_t, LCD) noexcept nogil
-
+@final
 cdef class VBKregister:
     cdef uint8_t active_bank
 
     cdef void set(self, uint8_t) noexcept nogil
     cdef uint8_t get(self) noexcept nogil
 
+@final
 cdef class PaletteIndexRegister:
     cdef uint8_t value
     cdef int auto_inc
@@ -265,6 +299,7 @@ cdef class PaletteIndexRegister:
     cdef int save_state(self, IntIOInterface) except -1
     cdef int load_state(self, IntIOInterface, int) except -1
 
+@final
 cdef class PaletteColorRegister:
     cdef uint16_t[8 * 4] palette_mem
     cdef uint32_t[8 * 4] palette_mem_rgb