bilbo/dreamcast
1
0
Fork 0
Code Pull Requests Activity

gdrom/command_packet_format: improve initializer; add _data() method

Browse Source
This commit is contained in:
Zack Buhman 2024-02-26 20:32:33 +08:00
parent 41b707e75d
commit c45cb293f0
6 changed files with 163 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -14,4 +14,4 @@ scramble
cdi4dc
tools/ttf_outline
*.blend1
*.scramble
*.scramble

6
example/gdrom_test.cpp
View File

@ -5,12 +5,6 @@
#include "sh7091/serial.hpp"
union data {
uint8_t u8[2];
uint16_t u16;
};
static_assert((sizeof (data)) == 2);
void test_unit()
{
serial::string("test_unit\n");

132
gdrom/command_packet_format.hpp
View File

@ -3,6 +3,8 @@
#include <cstdint>
#include <cstddef>
#include "command_packet_format_byte_order.hpp"
namespace gdrom_command_packet_format {
struct test_unit {
uint8_t command_code;
@ -32,6 +34,11 @@ namespace gdrom_command_packet_format {
, _res9(0)
, _res10(0)
{ }
const uint8_t * _data()
{
return reinterpret_cast<const uint8_t *>(this);
}
};
static_assert((sizeof (test_unit)) == 12);
static_assert((offsetof (struct test_unit, command_code)) == 0x00);
@ -77,6 +84,11 @@ namespace gdrom_command_packet_format {
, _res7(0)
, _res8(0)
{ }
const uint8_t * _data()
{
return reinterpret_cast<const uint8_t *>(this);
}
};
static_assert((sizeof (req_stat)) == 12);
static_assert((offsetof (struct req_stat, command_code)) == 0x00);
@ -122,6 +134,11 @@ namespace gdrom_command_packet_format {
, _res7(0)
, _res8(0)
{ }
const uint8_t * _data()
{
return reinterpret_cast<const uint8_t *>(this);
}
};
static_assert((sizeof (req_mode)) == 12);
static_assert((offsetof (struct req_mode, command_code)) == 0x00);
@ -167,6 +184,11 @@ namespace gdrom_command_packet_format {
, _res7(0)
, _res8(0)
{ }
const uint8_t * _data()
{
return reinterpret_cast<const uint8_t *>(this);
}
};
static_assert((sizeof (set_mode)) == 12);
static_assert((offsetof (struct set_mode, command_code)) == 0x00);
@ -211,6 +233,11 @@ namespace gdrom_command_packet_format {
, _res8(0)
, _res9(0)
{ }
const uint8_t * _data()
{
return reinterpret_cast<const uint8_t *>(this);
}
};
static_assert((sizeof (req_error)) == 12);
static_assert((offsetof (struct req_error, command_code)) == 0x00);
@ -239,12 +266,12 @@ namespace gdrom_command_packet_format {
uint8_t _res6;
uint8_t _res7;
get_toc(const uint8_t select
get_toc(const uint8_t select,
const uint32_t allocation_length
)
: command_code(0x14)
, select(select)
, _res0(0)
, allocation_length()
, _res1(0)
, _res2(0)
, _res3(0)
@ -252,7 +279,14 @@ namespace gdrom_command_packet_format {
, _res5(0)
, _res6(0)
, _res7(0)
{ }
{
byte_order<2>(&this->allocation_length[0], allocation_length);
}
const uint8_t * _data()
{
return reinterpret_cast<const uint8_t *>(this);
}
};
static_assert((sizeof (get_toc)) == 12);
static_assert((offsetof (struct get_toc, command_code)) == 0x00);
@ -297,6 +331,11 @@ namespace gdrom_command_packet_format {
, _res7(0)
, _res8(0)
{ }
const uint8_t * _data()
{
return reinterpret_cast<const uint8_t *>(this);
}
};
static_assert((sizeof (req_ses)) == 12);
static_assert((offsetof (struct req_ses, command_code)) == 0x00);
@ -340,6 +379,11 @@ namespace gdrom_command_packet_format {
, _res9(0)
, _res10(0)
{ }
const uint8_t * _data()
{
return reinterpret_cast<const uint8_t *>(this);
}
};
static_assert((sizeof (cd_open)) == 12);
static_assert((offsetof (struct cd_open, command_code)) == 0x00);
@ -366,17 +410,25 @@ namespace gdrom_command_packet_format {
uint8_t _res2;
cd_play(const uint8_t parameter_type,
const uint8_t repeat_times
const uint32_t starting_point,
const uint8_t repeat_times,
const uint32_t end_point
)
: command_code(0x20)
, parameter_type(parameter_type)
, starting_point()
, _res0(0)
, repeat_times(repeat_times)
, _res1(0)
, end_point()
, _res2(0)
{ }
{
byte_order<3>(&this->starting_point[0], starting_point);
byte_order<3>(&this->end_point[0], end_point);
}
const uint8_t * _data()
{
return reinterpret_cast<const uint8_t *>(this);
}
};
static_assert((sizeof (cd_play)) == 12);
static_assert((offsetof (struct cd_play, command_code)) == 0x00);
@ -400,11 +452,11 @@ namespace gdrom_command_packet_format {
uint8_t _res5;
uint8_t _res6;
cd_seek(const uint8_t parameter_type
cd_seek(const uint8_t parameter_type,
const uint32_t seek_point
)
: command_code(0x21)
, parameter_type(parameter_type)
, seek_point()
, _res0(0)
, _res1(0)
, _res2(0)
@ -412,7 +464,14 @@ namespace gdrom_command_packet_format {
, _res4(0)
, _res5(0)
, _res6(0)
{ }
{
byte_order<3>(&this->seek_point[0], seek_point);
}
const uint8_t * _data()
{
return reinterpret_cast<const uint8_t *>(this);
}
};
static_assert((sizeof (cd_seek)) == 12);
static_assert((offsetof (struct cd_seek, command_code)) == 0x00);
@ -456,6 +515,11 @@ namespace gdrom_command_packet_format {
, _res7(0)
, _res8(0)
{ }
const uint8_t * _data()
{
return reinterpret_cast<const uint8_t *>(this);
}
};
static_assert((sizeof (cd_scan)) == 12);
static_assert((offsetof (struct cd_scan, command_code)) == 0x00);
@ -481,17 +545,25 @@ namespace gdrom_command_packet_format {
uint8_t transfer_length[3];
uint8_t _res3;
cd_read(const uint8_t data
cd_read(const uint8_t data,
const uint32_t starting_address,
const uint32_t transfer_length
)
: command_code(0x30)
, data(data)
, starting_address()
, _res0(0)
, _res1(0)
, _res2(0)
, transfer_length()
, _res3(0)
{ }
{
byte_order<3>(&this->starting_address[0], starting_address);
byte_order<3>(&this->transfer_length[0], transfer_length);
}
const uint8_t * _data()
{
return reinterpret_cast<const uint8_t *>(this);
}
};
static_assert((sizeof (cd_read)) == 12);
static_assert((offsetof (struct cd_read, command_code)) == 0x00);
@ -512,16 +584,25 @@ namespace gdrom_command_packet_format {
uint8_t next_address[3];
uint8_t _res1;
cd_read2(const uint8_t data
cd_read2(const uint8_t data,
const uint32_t starting_address,
const uint32_t transfer_length,
const uint32_t next_address
)
: command_code(0x31)
, data(data)
, starting_address()
, _res0(0)
, transfer_length()
, next_address()
, _res1(0)
{ }
{
byte_order<3>(&this->starting_address[0], starting_address);
byte_order<2>(&this->transfer_length[0], transfer_length);
byte_order<3>(&this->next_address[0], next_address);
}
const uint8_t * _data()
{
return reinterpret_cast<const uint8_t *>(this);
}
};
static_assert((sizeof (cd_read2)) == 12);
static_assert((offsetof (struct cd_read2, command_code)) == 0x00);
@ -545,12 +626,12 @@ namespace gdrom_command_packet_format {
uint8_t _res6;
uint8_t _res7;
cd_scd(const uint8_t data_format
cd_scd(const uint8_t data_format,
const uint32_t allocation_length
)
: command_code(0x40)
, data_format(data_format)
, _res0(0)
, allocation_length()
, _res1(0)
, _res2(0)
, _res3(0)
@ -558,7 +639,14 @@ namespace gdrom_command_packet_format {
, _res5(0)
, _res6(0)
, _res7(0)
{ }
{
byte_order<2>(&this->allocation_length[0], allocation_length);
}
const uint8_t * _data()
{
return reinterpret_cast<const uint8_t *>(this);
}
};
static_assert((sizeof (cd_scd)) == 12);
static_assert((offsetof (struct cd_scd, command_code)) == 0x00);

21
gdrom/command_packet_format_byte_order.hpp Normal file
View File

@ -0,0 +1,21 @@
#include <cstdint>
namespace gdrom_command_packet_format {
template <int N>
constexpr void byte_order(uint8_t * buf, const uint32_t n);
template <>
constexpr void byte_order<2>(uint8_t * buf, const uint32_t n)
{
buf[0] = n >> 8;
buf[1] = n >> 0;
}
template <>
constexpr void byte_order<3>(uint8_t * buf, const uint32_t n)
{
buf[0] = n >> 16;
buf[1] = n >> 8;
buf[1] = n >> 0;
}
}

5
regs/gen/gdrom_command_packet_format.py
View File

@ -9,6 +9,10 @@ from generic_sparse_struct import render_declarations
def get_type(field_name: str):
return "uint8_t"
def headers2():
yield '#include "command_packet_format_byte_order.hpp"'
yield ""
if __name__ == "__main__":
rows = read_input_headerless(sys.argv[1])
namespace = sys.argv[2]
@ -18,5 +22,6 @@ if __name__ == "__main__":
from pprint import pprint
render, out = renderer()
render(headers())
render(headers2())
render(render_declarations(namespace, declarations, get_type))
print(out.getvalue())

31
regs/gen/generic_sparse_struct.py
View File

@ -104,12 +104,12 @@ def render_initializer(declaration, get_type):
constructor_fields = [f for f in declaration.fields
if (not f.name.startswith('_res')
and not f.array_length > 1
and f.default is None
)]
for i, field in enumerate(constructor_fields):
s = start(i)
type = get_type(field.name)
assert field.array_length <= 4, field
type = get_type(field.name) if field.array_length == 1 else "uint32_t"
comma = ',' if i + 1 < len(constructor_fields) else ''
yield s + f"const {type} {field.name}" + comma
@ -119,20 +119,37 @@ def render_initializer(declaration, get_type):
yield initializer + ')'
for i, field in enumerate(declaration.fields):
if field.array_length > 1:
continue
value = field.name if not field.name.startswith('_res') else '0'
value = hex(field.default) if field.default is not None else value
value = '' if field.array_length > 1 else value
s = ':' if i == 0 else ','
yield " " + s + f" {field.name}({value})"
yield "{ }"
array_fields = [f for f in declaration.fields
if f.array_length > 1]
if array_fields:
yield "{"
for field in array_fields:
yield f"byte_order<{field.array_length}>(&this->{field.name}[0], {field.name});"
yield "}"
else:
yield "{ }"
def render_static_assertions(declaration):
yield f"static_assert((sizeof ({declaration.name})) == {declaration.size});"
for field in declaration.fields:
yield f"static_assert((offsetof (struct {declaration.name}, {field.name})) == 0x{field.offset:02x});"
def render_data_method():
yield "const uint8_t * _data()"
yield "{"
yield "return reinterpret_cast<const uint8_t *>(this);"
yield "}"
def render_declaration(declaration, get_type):
yield f"struct {declaration.name} {{"
for field in declaration.fields:
type = get_type(field.name)
if field.array_length == 1:
@ -140,8 +157,12 @@ def render_declaration(declaration, get_type):
else:
yield f"{type} {field.name}[{field.array_length}];"
yield ""
yield from render_initializer(declaration, get_type)
yield "};"
yield ""
yield from render_data_method();
yield "};" # struct {declaration.name}
yield from render_static_assertions(declaration)
def render_declarations(namespace, declarations, get_type):