Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
boytacean
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
João Magalhães
boytacean
Commits
105f6548
Verified
Commit
105f6548
authored
8 months ago
by
João Magalhães
Browse files
Options
Downloads
Patches
Plain Diff
chore: new register testing
Adds OBP0_ADDR and OBP1_ADDR to the list of registers.
parent
d74f0917
No related branches found
No related tags found
No related merge requests found
Pipeline
#4487
passed
8 months ago
Stage: build
Stage: test
Stage: deploy
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/consts.rs
+2
-0
2 additions, 0 deletions
src/consts.rs
src/ppu.rs
+13
-7
13 additions, 7 deletions
src/ppu.rs
src/test.rs
+4
-2
4 additions, 2 deletions
src/test.rs
with
19 additions
and
9 deletions
src/consts.rs
+
2
−
0
View file @
105f6548
...
...
@@ -15,6 +15,8 @@ pub const SCX_ADDR: u16 = 0xff43;
pub
const
LY_ADDR
:
u16
=
0xff44
;
pub
const
LYC_ADDR
:
u16
=
0xff45
;
pub
const
BGP_ADDR
:
u16
=
0xff47
;
pub
const
OBP0_ADDR
:
u16
=
0xff48
;
pub
const
OBP1_ADDR
:
u16
=
0xff49
;
// DMA registers
pub
const
DMA_ADDR
:
u16
=
0xff46
;
...
...
This diff is collapsed.
Click to expand it.
src/ppu.rs
+
13
−
7
View file @
105f6548
...
...
@@ -15,7 +15,9 @@ use crate::{
rgb888_to_rgb565_u16
,
Pixel
,
PixelAlpha
,
RGB1555_SIZE
,
RGB565_SIZE
,
RGB888_SIZE
,
RGB_SIZE
,
XRGB8888_SIZE
,
},
consts
::{
BGP_ADDR
,
LCDC_ADDR
,
LYC_ADDR
,
LY_ADDR
,
SCX_ADDR
,
SCY_ADDR
,
STAT_ADDR
},
consts
::{
BGP_ADDR
,
LCDC_ADDR
,
LYC_ADDR
,
LY_ADDR
,
OBP0_ADDR
,
OBP1_ADDR
,
SCX_ADDR
,
SCY_ADDR
,
STAT_ADDR
,
},
gb
::{
GameBoyConfig
,
GameBoyMode
},
mmu
::
BusComponent
,
util
::
SharedThread
,
...
...
@@ -809,10 +811,12 @@ impl Ppu {
LY_ADDR
=>
self
.ly
,
// 0xFF45 — LYC
LYC_ADDR
=>
self
.lyc
,
// 0xFF47 — BGP
: BG palette data
(Non-CGB Mode only)
// 0xFF47 — BGP (Non-CGB Mode only)
BGP_ADDR
=>
self
.palettes
[
0
],
0xff48
=>
self
.palettes
[
1
],
0xff49
=>
self
.palettes
[
2
],
// 0xFF48 — OBP0 (Non-CGB Mode only)
OBP0_ADDR
=>
self
.palettes
[
1
],
// 0xFF49 — OBP1 (Non-CGB Mode only)
OBP1_ADDR
=>
self
.palettes
[
2
],
0xff4a
=>
self
.wy
,
0xff4b
=>
self
.wx
,
// 0xFF4F — VBK (CGB only)
...
...
@@ -893,7 +897,7 @@ impl Ppu {
SCX_ADDR
=>
self
.scx
=
value
,
// 0xFF45 — LYC: LY compare
LYC_ADDR
=>
self
.lyc
=
value
,
// 0xFF47 — BGP
: BG palette data
(Non-CGB Mode only)
// 0xFF47 — BGP (Non-CGB Mode only)
BGP_ADDR
=>
{
if
value
==
self
.palettes
[
0
]
{
return
;
...
...
@@ -905,7 +909,8 @@ impl Ppu {
}
self
.palettes
[
0
]
=
value
;
}
0xff48
=>
{
// 0xFF48 — OBP0 (Non-CGB Mode only)
OBP0_ADDR
=>
{
if
value
==
self
.palettes
[
1
]
{
return
;
}
...
...
@@ -920,7 +925,8 @@ impl Ppu {
}
self
.palettes
[
1
]
=
value
;
}
0xff49
=>
{
// 0xFF49 — OBP0 (Non-CGB Mode only)
OBP1_ADDR
=>
{
if
value
==
self
.palettes
[
2
]
{
return
;
}
...
...
This diff is collapsed.
Click to expand it.
src/test.rs
+
4
−
2
View file @
105f6548
...
...
@@ -79,8 +79,8 @@ pub fn run_image_test(
mod
tests
{
use
crate
::{
consts
::{
BGP_ADDR
,
DIV_ADDR
,
DMA_ADDR
,
IF_ADDR
,
LCDC_ADDR
,
LYC_ADDR
,
LY_ADDR
,
SCX
_ADDR
,
SCY_ADDR
,
STAT_ADDR
,
TAC_ADDR
,
TIMA_ADDR
,
TMA_ADDR
,
BGP_ADDR
,
DIV_ADDR
,
DMA_ADDR
,
IF_ADDR
,
LCDC_ADDR
,
LYC_ADDR
,
LY_ADDR
,
OBP0
_ADDR
,
OBP1_ADDR
,
SCX_ADDR
,
SCY_ADDR
,
STAT_ADDR
,
TAC_ADDR
,
TIMA_ADDR
,
TMA_ADDR
,
},
data
::
BootRom
,
};
...
...
@@ -120,6 +120,8 @@ mod tests {
assert_eq!
(
result
.ppu
()
.read
(
LY_ADDR
),
0x99
);
assert_eq!
(
result
.ppu
()
.read
(
LYC_ADDR
),
0x00
);
assert_eq!
(
result
.ppu
()
.read
(
BGP_ADDR
),
0xfc
);
assert_eq!
(
result
.ppu
()
.read
(
OBP0_ADDR
),
0x00
);
assert_eq!
(
result
.ppu
()
.read
(
OBP1_ADDR
),
0x00
);
assert_eq!
(
result
.ppu
()
.read
(
DMA_ADDR
),
0xff
);
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment