pyboy 2.2.0__tar.gz → 2.2.2__tar.gz

{pyboy-2.2.0/pyboy.egg-info → pyboy-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyboy
-Version: 2.2.0
+Version: 2.2.2
 Summary: Game Boy emulator written in Python
 Author-email: Mads Ynddal <mads@ynddal.dk>
 License: GNU Lesser General Public License

{pyboy-2.2.0 → pyboy-2.2.2}/pyboy/api/screen.py

@@ -202,12 +202,9 @@ class Screen:
         list:
             Nested list of SCX, SCY, WX and WY for each scanline (144x4). Returns (0, 0, 0, 0) when LCD is off.
         """
-        # self.tilemap_position_list = np.asarray(self.mb.lcd.renderer._scanlineparameters, dtype=np.uint8).reshape(144, 5)[:, :4]
-        # self.tilemap_position_list = self.mb.lcd.renderer._scanlineparameters
 
-        # # return self.mb.lcd.renderer._scanlineparameters
         if self.mb.lcd._LCDC.lcd_enable:
-            return [[line[0], line[1], line[2], line[3]] for line in self.mb.lcd.renderer._scanlineparameters]
+            return [[line[0], line[1], line[2], line[3]] for line in self.mb.lcd._scanlineparameters]
         else:
             return [[0, 0, 0, 0] for line in range(144)]
 

{pyboy-2.2.0 → pyboy-2.2.2}/pyboy/api/tile.pxd

@@ -5,7 +5,7 @@
 
 import cython
 
-from libc.stdint cimport uint8_t, uint16_t, uint32_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t
 
 from pyboy cimport utils
 from pyboy.core.mb cimport Motherboard
@@ -25,5 +25,5 @@ cdef class Tile:
     cpdef object ndarray(self) noexcept
 
     cdef uint32_t[:,:] data # TODO: Add to locals instead
-    @cython.locals(byte1=uint8_t, byte2=uint8_t, colorcode=uint32_t)
+    @cython.locals(byte1=uint8_t, byte2=uint8_t, colorcode=uint64_t)
     cdef uint32_t[:,:] _image_data(self) noexcept

{pyboy-2.2.0 → pyboy-2.2.2}/pyboy/api/tile.py

@@ -190,9 +190,9 @@ class Tile:
                 byte1 = self.mb.lcd.VRAM1[self.data_address + k - VRAM_OFFSET]
                 byte2 = self.mb.lcd.VRAM1[self.data_address + k + 1 - VRAM_OFFSET]
 
+            colorcode = self.mb.lcd.renderer.colorcode(byte1, byte2)
             for x in range(8):
-                colorcode = utils.color_code(byte1, byte2, 7 - x)
-                self.data[k // 2][x] = self.mb.lcd.BGP.getcolor(colorcode)
+                self.data[k // 2][x] = self.mb.lcd.BGP.getcolor((colorcode >> x * 8) & 0xFF)
         return self.data
 
     def __eq__(self, other):

{pyboy-2.2.0 → pyboy-2.2.2}/pyboy/core/cartridge/base_mbc.pxd

@@ -28,6 +28,7 @@ cdef class BaseMBC:
     cdef bint rambank_initialized
     cdef uint16_t rambank_selected
     cdef uint16_t rombank_selected
+    cdef uint16_t rombank_selected_low
     cdef bint cgb
 
     cdef void save_state(self, IntIOInterface) noexcept

{pyboy-2.2.0 → pyboy-2.2.2}/pyboy/core/cartridge/base_mbc.py

@@ -39,8 +39,9 @@ class BaseMBC:
         self.rambank_enabled = False
         self.rambank_selected = 0
         self.rombank_selected = 1
+        self.rombank_selected_low = 0
 
-        self.cgb = bool(self.getitem(0x0143) >> 7)
+        self.cgb = bool(self.rombanks[0, 0x0143] >> 7)
 
         if not os.path.exists(self.filename):
             logger.debug("No RAM file found. Skipping.")
@@ -118,11 +119,7 @@ class BaseMBC:
             logger.error("Invalid override address: %0.4x", address)
 
     def getitem(self, address):
-        if 0x0000 <= address < 0x4000:
-            return self.rombanks[0, address]
-        elif 0x4000 <= address < 0x8000:
-            return self.rombanks[self.rombank_selected, address - 0x4000]
-        elif 0xA000 <= address < 0xC000:
+        if 0xA000 <= address < 0xC000:
             # if not self.rambank_initialized:
             #     logger.error("RAM banks not initialized: 0.4x", address)
 
@@ -149,7 +146,7 @@ class BaseMBC:
             "Number of RAM banks: %s" % len(self.rambanks),
             "Active RAM bank: %s" % self.rambank_selected,
             "Battery: %s" % self.battery,
-            "RTC: %s" % self.rtc
+            "RTC: %s" % self.rtc_enabled
         ])
 
 

{pyboy-2.2.0 → pyboy-2.2.2}/pyboy/core/cartridge/mbc1.py

@@ -37,19 +37,15 @@ class MBC1(BaseMBC):
                 self.rambanks[self.rambank_selected % self.external_ram_count, address - 0xA000] = value
         # else:
         #     logger.error("Invalid writing address: %0.4x", address)
+        if self.memorymodel == 1:
+            self.rombank_selected_low = (self.bank_select_register2 << 5) % self.external_rom_count
+        else:
+            self.rombank_selected_low = 0
+        self.rombank_selected = ((self.bank_select_register2 << 5) |
+                                 self.bank_select_register1) % self.external_rom_count
 
     def getitem(self, address):
-        if 0x0000 <= address < 0x4000:
-            if self.memorymodel == 1:
-                self.rombank_selected = (self.bank_select_register2 << 5) % self.external_rom_count
-            else:
-                self.rombank_selected = 0
-            return self.rombanks[self.rombank_selected, address]
-        elif 0x4000 <= address < 0x8000:
-            self.rombank_selected = \
-                    ((self.bank_select_register2 << 5) | self.bank_select_register1) % self.external_rom_count
-            return self.rombanks[self.rombank_selected, address - 0x4000]
-        elif 0xA000 <= address < 0xC000:
+        if 0xA000 <= address < 0xC000:
             if not self.rambank_initialized:
                 logger.error("RAM banks not initialized: %0.4x", address)
 

{pyboy-2.2.0 → pyboy-2.2.2}/pyboy/core/cpu.pxd

@@ -50,7 +50,4 @@ cdef class CPU:
 
     cdef pyboy.core.mb.Motherboard mb
 
-    cdef void set_bc(CPU, uint16_t) noexcept nogil
-    cdef void set_de(CPU, uint16_t) noexcept nogil
-
     cdef dump_state(self, str) noexcept with gil

{pyboy-2.2.0 → pyboy-2.2.2}/pyboy/core/cpu.py

@@ -18,14 +18,6 @@ logger = pyboy.logging.get_logger(__name__)
 
 
 class CPU:
-    def set_bc(self, x):
-        self.B = x >> 8
-        self.C = x & 0x00FF
-
-    def set_de(self, x):
-        self.D = x >> 8
-        self.E = x & 0x00FF
-
     def __init__(self, mb):
         self.A = 0
         self.F = 0

{pyboy-2.2.0 → pyboy-2.2.2}/pyboy/core/lcd.pxd

@@ -47,8 +47,9 @@ cdef class LCD:
     cdef PaletteRegister OBP0
     cdef PaletteRegister OBP1
     cdef Renderer renderer
+    cdef uint8_t[144][5] _scanlineparameters
 
-    @cython.locals(interrupt_flag=uint8_t)
+    @cython.locals(interrupt_flag=uint8_t,bx=int,by=int,wx=int,wy=int)
     cdef uint8_t tick(self, int) noexcept nogil
     cdef int64_t cycles_to_interrupt(self) noexcept nogil
 
@@ -62,8 +63,8 @@ cdef class LCD:
     cdef void save_state(self, IntIOInterface) noexcept
     cdef void load_state(self, IntIOInterface, int) noexcept
 
-    cdef (int, int) getwindowpos(self) noexcept nogil
-    cdef (int, int) getviewport(self) noexcept nogil
+    cdef inline (int, int) getwindowpos(self) noexcept nogil
+    cdef inline (int, int) getviewport(self) noexcept nogil
 
     # CGB
     cdef bint cgb
@@ -108,6 +109,9 @@ cdef class LCDCRegister:
     cdef bint background_enable
     cdef bint cgb_master_priority
 
+    cdef uint16_t backgroundmap_offset
+    cdef uint16_t windowmap_offset
+
     cpdef int _get_sprite_height(self)
 
 cdef class Renderer:
@@ -124,19 +128,19 @@ cdef class Renderer:
     cdef array _tilecache0_raw, _spritecache0_raw, _spritecache1_raw
     cdef uint32_t[:,:] _screenbuffer
     cdef uint8_t[:,:] _screenbuffer_attributes
-    cdef uint32_t[:,:] _tilecache0, _spritecache0, _spritecache1
+    cdef uint8_t[:,:] _tilecache0, _spritecache0, _spritecache1
+    cdef uint64_t[:] _tilecache0_64, _tilecache1_64, _spritecache0_64, _spritecache1_64
+    cdef uint32_t[:] colorcode_table
 
     cdef int[10] sprites_to_render
     cdef int ly_window
     cdef void invalidate_tile(self, int, int) noexcept nogil
 
-    cdef uint8_t[144][5] _scanlineparameters
-
     cdef void blank_screen(self, LCD) noexcept nogil
 
     # CGB
     cdef array _tilecache1_raw
-    cdef uint32_t[:,:] _tilecache1
+    cdef uint8_t[:,:] _tilecache1
 
     @cython.locals(
         bx=int,
@@ -150,12 +154,24 @@ cdef class Renderer:
         bg_priority=bint,
         xx=int,
         yy=int,
-        tilecache=uint32_t[:,:],
+        tilecache=uint8_t[:,:],
         bg_priority_apply=uint32_t,
         col0=uint8_t,
+        pixel=uint32_t,
     )
     cdef void scanline(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) _get_tile_cgb(self, uint8_t, uint8_t, uint16_t, LCD) noexcept nogil
+    @cython.locals(col0=uint8_t)
+    cdef inline void _pixel(self, uint8_t[:,:], uint32_t, int, int, int, int, uint32_t) noexcept nogil
+    cdef int scanline_background(self, int, int, int, int, int, LCD) noexcept nogil
+    cdef int scanline_window(self, int, int, int, int, int, LCD) noexcept nogil
+    cdef int scanline_background_cgb(self, int, int, int, int, int, LCD) noexcept nogil
+    cdef int scanline_window_cgb(self, int, int, int, int, int, LCD) noexcept nogil
+    cdef int scanline_blank(self, int, int, int, LCD) noexcept nogil
+
     @cython.locals(
         spriteheight=int,
         spritecount=int,
@@ -169,7 +185,7 @@ cdef class Renderer:
         yflip=bint,
         spritepriority=bint,
         palette=uint8_t,
-        spritecache=uint32_t[:,:],
+        spritecache=uint8_t[:,:],
         dy=int,
         dx=int,
         yy=int,
@@ -180,7 +196,6 @@ cdef class Renderer:
     )
     cdef void scanline_sprites(self, LCD, int, uint32_t[:,:], uint8_t[:,:], bint) noexcept nogil
     cdef void sort_sprites(self, int) noexcept nogil
-    cdef inline uint8_t color_code(self, uint8_t, uint8_t, uint8_t) noexcept nogil
 
     cdef void clear_cache(self) noexcept nogil
     cdef void clear_tilecache0(self) noexcept nogil
@@ -194,7 +209,8 @@ cdef class Renderer:
         y=int,
         byte1=uint8_t,
         byte2=uint8_t,
-        colorcode=uint32_t,
+        colorcode_low=uint64_t,
+        colorcode_high=uint64_t,
     )
     cdef void update_tilecache0(self, LCD, int, int) noexcept nogil
     @cython.locals(
@@ -204,7 +220,8 @@ cdef class Renderer:
         y=int,
         byte1=uint8_t,
         byte2=uint8_t,
-        colorcode=uint32_t,
+        colorcode_low=uint64_t,
+        colorcode_high=uint64_t,
     )
     cdef void update_tilecache1(self, LCD, int, int) noexcept nogil # CGB Only
     @cython.locals(
@@ -214,7 +231,8 @@ cdef class Renderer:
         y=int,
         byte1=uint8_t,
         byte2=uint8_t,
-        colorcode=uint32_t,
+        colorcode_low=uint64_t,
+        colorcode_high=uint64_t,
     )
     cdef void update_spritecache0(self, LCD, int, int) noexcept nogil
     @cython.locals(
@@ -224,10 +242,13 @@ cdef class Renderer:
         y=int,
         byte1=uint8_t,
         byte2=uint8_t,
-        colorcode=uint32_t,
+        colorcode_low=uint64_t,
+        colorcode_high=uint64_t,
     )
     cdef void update_spritecache1(self, LCD, int, int) noexcept nogil
 
+    @cython.locals(colorcode_low=uint64_t, colorcode_high=uint64_t)
+    cdef inline uint64_t colorcode(self, uint64_t, uint64_t) noexcept nogil
 
     cdef void save_state(self, IntIOInterface) noexcept
     cdef void load_state(self, IntIOInterface, int) noexcept
@@ -240,7 +261,7 @@ cdef class Renderer:
         vertflip = uint8_t,
         bg_priority = uint8_t,
     )
-    cdef (int, int, int, int, int) _cgb_get_background_map_attributes(self, LCD, int) noexcept nogil
+    cdef inline (int, int, int, int, int) _cgb_get_background_map_attributes(self, LCD, int) noexcept nogil
 
 cdef class CGBLCD(LCD):
     pass