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
a42c6b42
Verified
Commit
a42c6b42
authored
6 months ago
by
João Magalhães
Browse files
Options
Downloads
Patches
Plain Diff
feat: DMA support for get and set state
parent
8d1a82f0
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!59
`StateComponent` creation and implementation
Pipeline
#5070
failed
6 months ago
Stage: build
Stage: test
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/dma.rs
+87
-2
87 additions, 2 deletions
src/dma.rs
with
87 additions
and
2 deletions
src/dma.rs
+
87
−
2
View file @
a42c6b42
//! DMA (Direct Memory Access) functions and structures.
//! DMA (Direct Memory Access) functions and structures.
use
std
::
fmt
::{
self
,
Display
,
Formatter
};
use
std
::{
fmt
::{
self
,
Display
,
Formatter
},
io
::
Cursor
,
};
use
boytacean_common
::{
data
::{
read_u16
,
read_u8
,
write_u16
,
write_u8
},
error
::
Error
,
};
use
crate
::{
use
crate
::{
consts
::{
DMA_ADDR
,
HDMA1_ADDR
,
HDMA2_ADDR
,
HDMA3_ADDR
,
HDMA4_ADDR
,
HDMA5_ADDR
},
consts
::{
DMA_ADDR
,
HDMA1_ADDR
,
HDMA2_ADDR
,
HDMA3_ADDR
,
HDMA4_ADDR
,
HDMA5_ADDR
},
mmu
::
BusComponent
,
mmu
::
BusComponent
,
panic_gb
,
warnln
,
panic_gb
,
state
::
StateComponent
,
warnln
,
};
};
#[derive(Clone,
Copy,
PartialEq,
Eq,
Debug)]
#[derive(Clone,
Copy,
PartialEq,
Eq,
Debug)]
...
@@ -29,6 +39,13 @@ impl DmaMode {
...
@@ -29,6 +39,13 @@ impl DmaMode {
_
=>
DmaMode
::
General
,
_
=>
DmaMode
::
General
,
}
}
}
}
pub
fn
into_u8
(
self
)
->
u8
{
match
self
{
DmaMode
::
General
=>
0x00
,
DmaMode
::
HBlank
=>
0x01
,
}
}
}
}
impl
Display
for
DmaMode
{
impl
Display
for
DmaMode
{
...
@@ -43,6 +60,12 @@ impl From<u8> for DmaMode {
...
@@ -43,6 +60,12 @@ impl From<u8> for DmaMode {
}
}
}
}
impl
From
<
DmaMode
>
for
u8
{
fn
from
(
value
:
DmaMode
)
->
Self
{
value
.into_u8
()
}
}
pub
struct
Dma
{
pub
struct
Dma
{
source
:
u16
,
source
:
u16
,
destination
:
u16
,
destination
:
u16
,
...
@@ -253,6 +276,36 @@ impl BusComponent for Dma {
...
@@ -253,6 +276,36 @@ impl BusComponent for Dma {
}
}
}
}
impl
StateComponent
for
Dma
{
fn
state
(
&
self
)
->
Result
<
Vec
<
u8
>
,
Error
>
{
let
mut
cursor
=
Cursor
::
new
(
vec!
[]);
write_u16
(
&
mut
cursor
,
self
.source
)
?
;
write_u16
(
&
mut
cursor
,
self
.destination
)
?
;
write_u16
(
&
mut
cursor
,
self
.length
)
?
;
write_u16
(
&
mut
cursor
,
self
.pending
)
?
;
write_u8
(
&
mut
cursor
,
self
.mode
.into
())
?
;
write_u8
(
&
mut
cursor
,
self
.value_dma
)
?
;
write_u16
(
&
mut
cursor
,
self
.cycles_dma
)
?
;
write_u8
(
&
mut
cursor
,
self
.active_dma
as
u8
)
?
;
write_u8
(
&
mut
cursor
,
self
.active_hdma
as
u8
)
?
;
Ok
(
cursor
.into_inner
())
}
fn
set_state
(
&
mut
self
,
data
:
&
[
u8
])
->
Result
<
(),
Error
>
{
let
mut
cursor
=
Cursor
::
new
(
data
);
self
.source
=
read_u16
(
&
mut
cursor
)
?
;
self
.destination
=
read_u16
(
&
mut
cursor
)
?
;
self
.length
=
read_u16
(
&
mut
cursor
)
?
;
self
.pending
=
read_u16
(
&
mut
cursor
)
?
;
self
.mode
=
read_u8
(
&
mut
cursor
)
?
.into
();
self
.value_dma
=
read_u8
(
&
mut
cursor
)
?
;
self
.cycles_dma
=
read_u16
(
&
mut
cursor
)
?
;
self
.active_dma
=
read_u8
(
&
mut
cursor
)
?
==
1
;
self
.active_hdma
=
read_u8
(
&
mut
cursor
)
?
==
1
;
Ok
(())
}
}
impl
Default
for
Dma
{
impl
Default
for
Dma
{
fn
default
()
->
Self
{
fn
default
()
->
Self
{
Self
::
new
()
Self
::
new
()
...
@@ -269,6 +322,8 @@ impl Display for Dma {
...
@@ -269,6 +322,8 @@ impl Display for Dma {
mod
tests
{
mod
tests
{
use
super
::{
Dma
,
DmaMode
};
use
super
::{
Dma
,
DmaMode
};
use
crate
::
state
::
StateComponent
;
#[test]
#[test]
fn
test_dma_default
()
{
fn
test_dma_default
()
{
let
dma
=
Dma
::
default
();
let
dma
=
Dma
::
default
();
...
@@ -310,4 +365,34 @@ mod tests {
...
@@ -310,4 +365,34 @@ mod tests {
assert!
(
dma
.active_dma
);
assert!
(
dma
.active_dma
);
assert!
(
dma
.active
());
assert!
(
dma
.active
());
}
}
#[test]
fn
test_state_and_set_state
()
{
let
mut
dma
=
Dma
::
new
();
dma
.source
=
0x1234
;
dma
.destination
=
0x5678
;
dma
.length
=
0x9abc
;
dma
.pending
=
0xdef0
;
dma
.mode
=
DmaMode
::
HBlank
;
dma
.value_dma
=
0xff
;
dma
.cycles_dma
=
0x0012
;
dma
.active_dma
=
true
;
dma
.active_hdma
=
true
;
let
state
=
dma
.state
()
.unwrap
();
assert_eq!
(
state
.len
(),
14
);
let
mut
new_dma
=
Dma
::
new
();
new_dma
.set_state
(
&
state
)
.unwrap
();
assert_eq!
(
dma
.source
,
new_dma
.source
);
assert_eq!
(
dma
.destination
,
new_dma
.destination
);
assert_eq!
(
dma
.length
,
new_dma
.length
);
assert_eq!
(
dma
.pending
,
new_dma
.pending
);
assert_eq!
(
dma
.mode
,
new_dma
.mode
);
assert_eq!
(
dma
.value_dma
,
new_dma
.value_dma
);
assert_eq!
(
dma
.cycles_dma
,
new_dma
.cycles_dma
);
assert_eq!
(
dma
.active_dma
,
new_dma
.active_dma
);
assert_eq!
(
dma
.active_hdma
,
new_dma
.active_hdma
);
}
}
}
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