comparing dcbe1c72903ea07ed64347cbe2467cba0af205a1 and main on baileytownsend.dev/DMG-Playground

-229

Cargo.lock

···

       5
       5
        
       [[package]]

     

       6
       6
        
       name = "GameBoyPlayground"

     

       7
       7
        
       version = "0.1.0"

     

       8
       8
       -
       dependencies = [

     

       9
       9
       -
        "minifb",

     

       10
       10
       -
       ]

     

       11
       11
       -
       

     

       12
       12
       -
       [[package]]

     

       13
       13
       -
       name = "bitflags"

     

       14
       14
       -
       version = "1.3.2"

     

       15
       15
       -
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       16
       16
       -
       checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"

     

       17
       17
       -
       

     

       18
       18
       -
       [[package]]

     

       19
       19
       -
       name = "bitflags"

     

       20
       20
       -
       version = "2.9.1"

     

       21
       21
       -
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       22
       22
       -
       checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"

     

       23
       23
       -
       

     

       24
       24
       -
       [[package]]

     

       25
       25
       -
       name = "cc"

     

       26
       26
       -
       version = "1.2.30"

     

       27
       27
       -
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       28
       28
       -
       checksum = "deec109607ca693028562ed836a5f1c4b8bd77755c4e132fc5ce11b0b6211ae7"

     

       29
       29
       -
       dependencies = [

     

       30
       30
       -
        "shlex",

     

       31
       31
       -
       ]

     

       32
       32
       -
       

     

       33
       33
       -
       [[package]]

     

       34
       34
       -
       name = "cfg-if"

     

       35
       35
       -
       version = "1.0.1"

     

       36
       36
       -
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       37
       37
       -
       checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"

     

       38
       38
       -
       

     

       39
       39
       -
       [[package]]

     

       40
       40
       -
       name = "gdi32-sys"

     

       41
       41
       -
       version = "0.1.2"

     

       42
       42
       -
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       43
       43
       -
       checksum = "8e3eb92c1107527888f86b6ebb0b7f82794777dbf172a932998660a0a2e26c11"

     

       44
       44
       -
       dependencies = [

     

       45
       45
       -
        "winapi 0.2.8",

     

       46
       46
       -
        "winapi-build",

     

       47
       47
       -
       ]

     

       48
       48
       -
       

     

       49
       49
       -
       [[package]]

     

       50
       50
       -
       name = "kernel32-sys"

     

       51
       51
       -
       version = "0.2.2"

     

       52
       52
       -
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       53
       53
       -
       checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"

     

       54
       54
       -
       dependencies = [

     

       55
       55
       -
        "winapi 0.2.8",

     

       56
       56
       -
        "winapi-build",

     

       57
       57
       -
       ]

     

       58
       58
       -
       

     

       59
       59
       -
       [[package]]

     

       60
       60
       -
       name = "lazy_static"

     

       61
       61
       -
       version = "0.2.11"

     

       62
       62
       -
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       63
       63
       -
       checksum = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"

     

       64
       64
       -
       

     

       65
       65
       -
       [[package]]

     

       66
       66
       -
       name = "lazy_static"

     

       67
       67
       -
       version = "1.5.0"

     

       68
       68
       -
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       69
       69
       -
       checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"

     

       70
       70
       -
       

     

       71
       71
       -
       [[package]]

     

       72
       72
       -
       name = "libc"

     

       73
       73
       -
       version = "0.2.174"

     

       74
       74
       -
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       75
       75
       -
       checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"

     

       76
       76
       -
       

     

       77
       77
       -
       [[package]]

     

       78
       78
       -
       name = "libredox"

     

       79
       79
       -
       version = "0.1.6"

     

       80
       80
       -
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       81
       81
       -
       checksum = "4488594b9328dee448adb906d8b126d9b7deb7cf5c22161ee591610bb1be83c0"

     

       82
       82
       -
       dependencies = [

     

       83
       83
       -
        "bitflags 2.9.1",

     

       84
       84
       -
        "libc",

     

       85
       85
       -
        "redox_syscall",

     

       86
       86
       -
       ]

     

       87
       87
       -
       

     

       88
       88
       -
       [[package]]

     

       89
       89
       -
       name = "minifb"

     

       90
       90
       -
       version = "0.10.7"

     

       91
       91
       -
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       92
       92
       -
       checksum = "8cebe353532532dd30eaab68ece91e624ccf6f97453f2da84042f5915450a137"

     

       93
       93
       -
       dependencies = [

     

       94
       94
       -
        "cc",

     

       95
       95
       -
        "gdi32-sys",

     

       96
       96
       -
        "kernel32-sys",

     

       97
       97
       -
        "orbclient",

     

       98
       98
       -
        "time",

     

       99
       99
       -
        "user32-sys",

     

       100
       100
       -
        "winapi 0.2.8",

     

       101
       101
       -
        "x11-dl",

     

       102
       102
       -
       ]

     

       103
       103
       -
       

     

       104
       104
       -
       [[package]]

     

       105
       105
       -
       name = "orbclient"

     

       106
       106
       -
       version = "0.3.48"

     

       107
       107
       -
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       108
       108
       -
       checksum = "ba0b26cec2e24f08ed8bb31519a9333140a6599b867dac464bb150bdb796fd43"

     

       109
       109
       -
       dependencies = [

     

       110
       110
       -
        "libc",

     

       111
       111
       -
        "libredox",

     

       112
       112
       -
        "sdl2",

     

       113
       113
       -
        "sdl2-sys",

     

       114
       114
       -
       ]

     

       115
       115
       -
       

     

       116
       116
       -
       [[package]]

     

       117
       117
       -
       name = "pkg-config"

     

       118
       118
       -
       version = "0.3.32"

     

       119
       119
       -
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       120
       120
       -
       checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"

     

       121
       121
       -
       

     

       122
       122
       -
       [[package]]

     

       123
       123
       -
       name = "redox_syscall"

     

       124
       124
       -
       version = "0.5.15"

     

       125
       125
       -
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       126
       126
       -
       checksum = "7e8af0dde094006011e6a740d4879319439489813bd0bcdc7d821beaeeff48ec"

     

       127
       127
       -
       dependencies = [

     

       128
       128
       -
        "bitflags 2.9.1",

     

       129
       129
       -
       ]

     

       130
       130
       -
       

     

       131
       131
       -
       [[package]]

     

       132
       132
       -
       name = "sdl2"

     

       133
       133
       -
       version = "0.35.2"

     

       134
       134
       -
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       135
       135
       -
       checksum = "f7959277b623f1fb9e04aea73686c3ca52f01b2145f8ea16f4ff30d8b7623b1a"

     

       136
       136
       -
       dependencies = [

     

       137
       137
       -
        "bitflags 1.3.2",

     

       138
       138
       -
        "lazy_static 1.5.0",

     

       139
       139
       -
        "libc",

     

       140
       140
       -
        "sdl2-sys",

     

       141
       141
       -
       ]

     

       142
       142
       -
       

     

       143
       143
       -
       [[package]]

     

       144
       144
       -
       name = "sdl2-sys"

     

       145
       145
       -
       version = "0.35.2"

     

       146
       146
       -
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       147
       147
       -
       checksum = "e3586be2cf6c0a8099a79a12b4084357aa9b3e0b0d7980e3b67aaf7a9d55f9f0"

     

       148
       148
       -
       dependencies = [

     

       149
       149
       -
        "cfg-if",

     

       150
       150
       -
        "libc",

     

       151
       151
       -
        "version-compare",

     

       152
       152
       -
       ]

     

       153
       153
       -
       

     

       154
       154
       -
       [[package]]

     

       155
       155
       -
       name = "shlex"

     

       156
       156
       -
       version = "1.3.0"

     

       157
       157
       -
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       158
       158
       -
       checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"

     

       159
       159
       -
       

     

       160
       160
       -
       [[package]]

     

       161
       161
       -
       name = "time"

     

       162
       162
       -
       version = "0.1.45"

     

       163
       163
       -
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       164
       164
       -
       checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"

     

       165
       165
       -
       dependencies = [

     

       166
       166
       -
        "libc",

     

       167
       167
       -
        "wasi",

     

       168
       168
       -
        "winapi 0.3.9",

     

       169
       169
       -
       ]

     

       170
       170
       -
       

     

       171
       171
       -
       [[package]]

     

       172
       172
       -
       name = "user32-sys"

     

       173
       173
       -
       version = "0.1.3"

     

       174
       174
       -
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       175
       175
       -
       checksum = "e6b719983b952c04198829b51653c06af36f0e44c967fcc1a2bb397ceafbf80a"

     

       176
       176
       -
       dependencies = [

     

       177
       177
       -
        "winapi 0.2.8",

     

       178
       178
       -
        "winapi-build",

     

       179
       179
       -
       ]

     

       180
       180
       -
       

     

       181
       181
       -
       [[package]]

     

       182
       182
       -
       name = "version-compare"

     

       183
       183
       -
       version = "0.1.1"

     

       184
       184
       -
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       185
       185
       -
       checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29"

     

       186
       186
       -
       

     

       187
       187
       -
       [[package]]

     

       188
       188
       -
       name = "wasi"

     

       189
       189
       -
       version = "0.10.0+wasi-snapshot-preview1"

     

       190
       190
       -
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       191
       191
       -
       checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"

     

       192
       192
       -
       

     

       193
       193
       -
       [[package]]

     

       194
       194
       -
       name = "winapi"

     

       195
       195
       -
       version = "0.2.8"

     

       196
       196
       -
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       197
       197
       -
       checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"

     

       198
       198
       -
       

     

       199
       199
       -
       [[package]]

     

       200
       200
       -
       name = "winapi"

     

       201
       201
       -
       version = "0.3.9"

     

       202
       202
       -
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       203
       203
       -
       checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"

     

       204
       204
       -
       dependencies = [

     

       205
       205
       -
        "winapi-i686-pc-windows-gnu",

     

       206
       206
       -
        "winapi-x86_64-pc-windows-gnu",

     

       207
       207
       -
       ]

     

       208
       208
       -
       

     

       209
       209
       -
       [[package]]

     

       210
       210
       -
       name = "winapi-build"

     

       211
       211
       -
       version = "0.1.1"

     

       212
       212
       -
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       213
       213
       -
       checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"

     

       214
       214
       -
       

     

       215
       215
       -
       [[package]]

     

       216
       216
       -
       name = "winapi-i686-pc-windows-gnu"

     

       217
       217
       -
       version = "0.4.0"

     

       218
       218
       -
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       219
       219
       -
       checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"

     

       220
       220
       -
       

     

       221
       221
       -
       [[package]]

     

       222
       222
       -
       name = "winapi-x86_64-pc-windows-gnu"

     

       223
       223
       -
       version = "0.4.0"

     

       224
       224
       -
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       225
       225
       -
       checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

     

       226
       226
       -
       

     

       227
       227
       -
       [[package]]

     

       228
       228
       -
       name = "x11-dl"

     

       229
       229
       -
       version = "2.14.0"

     

       230
       230
       -
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       231
       231
       -
       checksum = "326c500cdc166fd7c70dd8c8a829cd5c0ce7be5a5d98c25817de2b9bdc67faf8"

     

       232
       232
       -
       dependencies = [

     

       233
       233
       -
        "lazy_static 0.2.11",

     

       234
       234
       -
        "libc",

     

       235
       235
       -
        "pkg-config",

     

       236
       236
       -
       ]

-1

Cargo.toml

···

       4
       4
        
       edition = "2024"

     

       5
       5
        
       

     

       6
       6
        
       [dependencies]

     

       7
       7
       -
       minifb = "0.10.7"

+3 -9

src/cartridge_header.rs

···

       5
       5
        
       

     

       6
       6
        
       pub struct CartridgeHeader {

     

       7
       7
        
           //Should be 80 bytes (0x014F(335) - 0x0100(256)) + 1 to include the last address

     

       8
       8
       -
           pub buffer: [u8; 80],

     

       8
       8
       +
           pub _buffer: [u8; 80],

     

       9
       9
        
           pub title: [char; 16],

     

       10
       10
        
           pub manufacturer_code: [char; 4],

     

       11
       11
        
           pub cgb_flag: CGBFlag,

     
···

       49
       49
        
               for (i, true_logo_byte) in NINTENDO_LOGO.iter().enumerate() {

     

       50
       50
        
                   let rom_byte = nintendo_logo_from_rom[i];

     

       51
       51
        
                   if rom_byte != *true_logo_byte {

     

       52
       52
       -
                       return Err(Error::CartridgeReadError);

     

       52
       52
       +
                       return Err(Error::NotAValidRom);

     

       53
       53
        
                   }

     

       54
       54
        
               }

     

       55
       55
        
       

     
···

       97
       97
        
               ]);

     

       98
       98
        
       

     

       99
       99
        
               Ok(Self {

     

       100
       100
       -
                   buffer: header_buffer

     

       100
       100
       +
                   _buffer: header_buffer

     

       101
       101
        
                       .try_into()

     

       102
       102
        
                       .map_err(|_| Error::CartridgeReadError)?,

     

       103
       103
        
                   title: title_chars,

     
···

       115
       115
        
                   global_checksum,

     

       116
       116
        
               })

     

       117
       117
        
           }

     

       118
       118
       -
       

     

       119
       119
       -
           fn print_test(&self) {

     

       120
       120
       -
               for byte in self.buffer.iter() {

     

       121
       121
       -
                   print!("{} ", *byte as char);

     

       122
       122
       -
               }

     

       123
       123
       -
           }

     

       124
       118
        
       }

+1 -1

src/enums.rs

···

       3
       3
        
           CartridgeHeaderStart = 0x0100,

     

       4
       4
        
           CartridgeHeaderEnd = 0x014F,

     

       5
       5
        
           // 0100-0103 — Entry point

     

       6
       6
       -
           EntryPointEnd = 0x0103,

     

       6
       6
       +
           _EntryPointEnd = 0x0103,

     

       7
       7
        
           // 0104-0133 — Nintendo logo

     

       8
       8
        
           NintendoLogoStart = 0x0104,

     

       9
       9
        
           NintendoLogoEnd = 0x00133,

+8 -1

README.md

···

       1
       1
       -
       # GameBoyPlayground

     

       1
       1
       +
       # DMG Playground

     

       2
       2
       +
       

     

       3
       3
       +
       Just some experiments with Gameboy emulation. Right now it just reads

     

       4
       4
       +
       the [Cartridge Header](https://gbdev.io/pandocs/The_Cartridge_Header.html) of a GB rom and parses it

     

       5
       5
       +
       out

     

       6
       6
       +
       

     

       7
       7
       +
       1. Obtain a `LegallyObtainedRom.gb` and name it as such in the root of the project

     

       8
       8
       +
       2. `cargo run` You should see it list out things like the name of the game, etc

Compare changes