scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor ROM class to use uint32_t for loop counters in LoadLinkGraphics, LoadAllGraphicsData, LoadGfxGroups, and SaveGroupsToRom methods

Browse Source
This commit is contained in:
scawful
2024-08-22 01:28:04 -04:00
parent 94108ebc0d
commit 4099d8731d
2 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/app/rom.cc
View File

@@ -66,7 +66,7 @@ absl::Status Rom::LoadLinkGraphics() {
const uint16_t kLinkGfxLength = 0x800; // 0x4000 or 0x7000? const uint16_t kLinkGfxLength = 0x800; // 0x4000 or 0x7000?
// Load Links graphics from the ROM // Load Links graphics from the ROM
for (int i = 0; i < kNumLinkSheets; i++) { for (uint32_t i = 0; i < kNumLinkSheets; i++) {
ASSIGN_OR_RETURN( ASSIGN_OR_RETURN(
auto link_sheet_data, auto link_sheet_data,
ReadByteVector(/*offset=*/kLinkGfxOffset + (i * kLinkGfxLength), ReadByteVector(/*offset=*/kLinkGfxOffset + (i * kLinkGfxLength),
@@ -84,7 +84,7 @@ absl::Status Rom::LoadAllGraphicsData() {
std::vector<uint8_t> sheet; std::vector<uint8_t> sheet;
bool bpp3 = false; bool bpp3 = false;
for (int i = 0; i < kNumGfxSheets; i++) { for (uint32_t i = 0; i < kNumGfxSheets; i++) {
if (i >= 115 && i <= 126) { // uncompressed sheets if (i >= 115 && i <= 126) { // uncompressed sheets
sheet.resize(Uncompressed3BPPSize); sheet.resize(Uncompressed3BPPSize);
auto offset = auto offset =
@@ -383,26 +383,26 @@ absl::Status Rom::LoadGfxGroups() {
ASSIGN_OR_RETURN(auto main_blockset_ptr, ReadWord(kGfxGroupsPointer)); ASSIGN_OR_RETURN(auto main_blockset_ptr, ReadWord(kGfxGroupsPointer));
main_blockset_ptr = core::SnesToPc(main_blockset_ptr); main_blockset_ptr = core::SnesToPc(main_blockset_ptr);
for (int i = 0; i < kNumMainBlocksets; i++) { for (uint32_t i = 0; i < kNumMainBlocksets; i++) {
for (int j = 0; j < 8; j++) { for (int j = 0; j < 8; j++) {
main_blockset_ids[i][j] = rom_data_[main_blockset_ptr + (i * 8) + j]; main_blockset_ids[i][j] = rom_data_[main_blockset_ptr + (i * 8) + j];
} }
} }
for (int i = 0; i < kNumRoomBlocksets; i++) { for (uint32_t i = 0; i < kNumRoomBlocksets; i++) {
for (int j = 0; j < 4; j++) { for (int j = 0; j < 4; j++) {
room_blockset_ids[i][j] = rom_data_[kEntranceGfxGroup + (i * 4) + j]; room_blockset_ids[i][j] = rom_data_[kEntranceGfxGroup + (i * 4) + j];
} }
} }
for (int i = 0; i < kNumSpritesets; i++) { for (uint32_t i = 0; i < kNumSpritesets; i++) {
for (int j = 0; j < 4; j++) { for (int j = 0; j < 4; j++) {
spriteset_ids[i][j] = spriteset_ids[i][j] =
rom_data_[version_constants().kSpriteBlocksetPointer + (i * 4) + j]; rom_data_[version_constants().kSpriteBlocksetPointer + (i * 4) + j];
} }
} }
for (int i = 0; i < kNumPalettesets; i++) { for (uint32_t i = 0; i < kNumPalettesets; i++) {
for (int j = 0; j < 4; j++) { for (int j = 0; j < 4; j++) {
paletteset_ids[i][j] = paletteset_ids[i][j] =
rom_data_[version_constants().kDungeonPalettesGroups + (i * 4) + j]; rom_data_[version_constants().kDungeonPalettesGroups + (i * 4) + j];
@@ -416,26 +416,26 @@ absl::Status Rom::SaveGroupsToRom() {
ASSIGN_OR_RETURN(auto main_blockset_ptr, ReadWord(kGfxGroupsPointer)); ASSIGN_OR_RETURN(auto main_blockset_ptr, ReadWord(kGfxGroupsPointer));
main_blockset_ptr = core::SnesToPc(main_blockset_ptr); main_blockset_ptr = core::SnesToPc(main_blockset_ptr);
for (int i = 0; i < kNumMainBlocksets; i++) { for (uint32_t i = 0; i < kNumMainBlocksets; i++) {
for (int j = 0; j < 8; j++) { for (int j = 0; j < 8; j++) {
rom_data_[main_blockset_ptr + (i * 8) + j] = main_blockset_ids[i][j]; rom_data_[main_blockset_ptr + (i * 8) + j] = main_blockset_ids[i][j];
} }
} }
for (int i = 0; i < kNumRoomBlocksets; i++) { for (uint32_t i = 0; i < kNumRoomBlocksets; i++) {
for (int j = 0; j < 4; j++) { for (int j = 0; j < 4; j++) {
rom_data_[kEntranceGfxGroup + (i * 4) + j] = room_blockset_ids[i][j]; rom_data_[kEntranceGfxGroup + (i * 4) + j] = room_blockset_ids[i][j];
} }
} }
for (int i = 0; i < kNumSpritesets; i++) { for (uint32_t i = 0; i < kNumSpritesets; i++) {
for (int j = 0; j < 4; j++) { for (int j = 0; j < 4; j++) {
rom_data_[version_constants().kSpriteBlocksetPointer + (i * 4) + j] = rom_data_[version_constants().kSpriteBlocksetPointer + (i * 4) + j] =
spriteset_ids[i][j]; spriteset_ids[i][j];
} }
} }
for (int i = 0; i < kNumPalettesets; i++) { for (uint32_t i = 0; i < kNumPalettesets; i++) {
for (int j = 0; j < 4; j++) { for (int j = 0; j < 4; j++) {
rom_data_[version_constants().kDungeonPalettesGroups + (i * 4) + j] = rom_data_[version_constants().kDungeonPalettesGroups + (i * 4) + j] =
paletteset_ids[i][j]; paletteset_ids[i][j];

27
src/app/rom.h
View File

@@ -255,7 +255,7 @@ class Rom : public core::ExperimentFlags {
// Read functions // Read functions
absl::StatusOr<uint8_t> ReadByte(int offset) { absl::StatusOr<uint8_t> ReadByte(int offset) {
RETURN_IF_ERROR(ReadWritePreconditions()); RETURN_IF_ERROR(ReadWritePreconditions());
if (offset >= rom_data_.size()) { if (offset >= static_cast<int>(rom_data_.size())) {
return absl::FailedPreconditionError("Offset out of range"); return absl::FailedPreconditionError("Offset out of range");
} }
return rom_data_[offset]; return rom_data_[offset];
@@ -263,7 +263,7 @@ class Rom : public core::ExperimentFlags {
absl::StatusOr<uint16_t> ReadWord(int offset) { absl::StatusOr<uint16_t> ReadWord(int offset) {
RETURN_IF_ERROR(ReadWritePreconditions()); RETURN_IF_ERROR(ReadWritePreconditions());
if (offset + 1 >= rom_data_.size()) { if (offset + 1 >= static_cast<int>(rom_data_.size())) {
return absl::FailedPreconditionError("Offset out of range"); return absl::FailedPreconditionError("Offset out of range");
} }
auto result = (uint16_t)(rom_data_[offset] | (rom_data_[offset + 1] << 8)); auto result = (uint16_t)(rom_data_[offset] | (rom_data_[offset + 1] << 8));
@@ -276,7 +276,7 @@ class Rom : public core::ExperimentFlags {
absl::StatusOr<uint32_t> ReadLong(int offset) { absl::StatusOr<uint32_t> ReadLong(int offset) {
RETURN_IF_ERROR(ReadWritePreconditions()); RETURN_IF_ERROR(ReadWritePreconditions());
if (offset + 2 >= rom_data_.size()) { if (offset + 2 >= static_cast<int>(rom_data_.size())) {
return absl::OutOfRangeError("Offset out of range"); return absl::OutOfRangeError("Offset out of range");
} }
auto result = (uint32_t)(rom_data_[offset] | (rom_data_[offset + 1] << 8) | auto result = (uint32_t)(rom_data_[offset] | (rom_data_[offset + 1] << 8) |
@@ -287,11 +287,11 @@ class Rom : public core::ExperimentFlags {
absl::StatusOr<std::vector<uint8_t>> ReadByteVector(uint32_t offset, absl::StatusOr<std::vector<uint8_t>> ReadByteVector(uint32_t offset,
uint32_t length) { uint32_t length) {
RETURN_IF_ERROR(ReadWritePreconditions()); RETURN_IF_ERROR(ReadWritePreconditions());
if (offset + length > rom_data_.size()) { if (offset + length > static_cast<uint32_t>(rom_data_.size())) {
return absl::OutOfRangeError("Offset and length out of range"); return absl::OutOfRangeError("Offset and length out of range");
} }
std::vector<uint8_t> result; std::vector<uint8_t> result;
for (int i = offset; i < offset + length; i++) { for (uint32_t i = offset; i < offset + length; i++) {
result.push_back(rom_data_[i]); result.push_back(rom_data_[i]);
} }
return result; return result;
@@ -330,7 +330,7 @@ class Rom : public core::ExperimentFlags {
// Write functions // Write functions
absl::Status Write(int addr, int value) { absl::Status Write(int addr, int value) {
if (addr >= rom_data_.size()) { if (addr >= static_cast<int>(rom_data_.size())) {
return absl::InvalidArgumentError(absl::StrFormat( return absl::InvalidArgumentError(absl::StrFormat(
"Attempt to write %d value failed, address %d out of range", value, "Attempt to write %d value failed, address %d out of range", value,
addr)); addr));
@@ -341,7 +341,7 @@ class Rom : public core::ExperimentFlags {
absl::Status WriteByte(int addr, uint8_t value) { absl::Status WriteByte(int addr, uint8_t value) {
RETURN_IF_ERROR(ReadWritePreconditions()); RETURN_IF_ERROR(ReadWritePreconditions());
if (addr >= rom_data_.size()) { if (addr >= static_cast<int>(rom_data_.size())) {
return absl::OutOfRangeError(absl::StrFormat( return absl::OutOfRangeError(absl::StrFormat(
"Attempt to write byte %#02x value failed, address %d out of range", "Attempt to write byte %#02x value failed, address %d out of range",
value, addr)); value, addr));
@@ -355,7 +355,7 @@ class Rom : public core::ExperimentFlags {
absl::Status WriteWord(int addr, uint16_t value) { absl::Status WriteWord(int addr, uint16_t value) {
RETURN_IF_ERROR(ReadWritePreconditions()); RETURN_IF_ERROR(ReadWritePreconditions());
if (addr + 1 >= rom_data_.size()) { if (addr + 1 >= static_cast<int>(rom_data_.size())) {
return absl::OutOfRangeError(absl::StrFormat( return absl::OutOfRangeError(absl::StrFormat(
"Attempt to write word %#04x value failed, address %d out of range", "Attempt to write word %#04x value failed, address %d out of range",
value, addr)); value, addr));
@@ -369,7 +369,7 @@ class Rom : public core::ExperimentFlags {
absl::Status WriteShort(int addr, uint16_t value) { absl::Status WriteShort(int addr, uint16_t value) {
RETURN_IF_ERROR(ReadWritePreconditions()); RETURN_IF_ERROR(ReadWritePreconditions());
if (addr + 1 >= rom_data_.size()) { if (addr + 1 >= static_cast<int>(rom_data_.size())) {
return absl::OutOfRangeError(absl::StrFormat( return absl::OutOfRangeError(absl::StrFormat(
"Attempt to write short %#04x value failed, address %d out of range", "Attempt to write short %#04x value failed, address %d out of range",
value, addr)); value, addr));
@@ -383,7 +383,7 @@ class Rom : public core::ExperimentFlags {
absl::Status WriteLong(uint32_t addr, uint32_t value) { absl::Status WriteLong(uint32_t addr, uint32_t value) {
RETURN_IF_ERROR(ReadWritePreconditions()); RETURN_IF_ERROR(ReadWritePreconditions());
if (addr + 2 >= rom_data_.size()) { if (addr + 2 >= static_cast<uint32_t>(rom_data_.size())) {
return absl::OutOfRangeError(absl::StrFormat( return absl::OutOfRangeError(absl::StrFormat(
"Attempt to write long %#06x value failed, address %d out of range", "Attempt to write long %#06x value failed, address %d out of range",
value, addr)); value, addr));
@@ -397,12 +397,13 @@ class Rom : public core::ExperimentFlags {
} }
absl::Status WriteVector(int addr, std::vector<uint8_t> data) { absl::Status WriteVector(int addr, std::vector<uint8_t> data) {
if (addr + data.size() > rom_data_.size()) { if (addr + static_cast<int>(data.size()) >
static_cast<int>(rom_data_.size())) {
return absl::InvalidArgumentError(absl::StrFormat( return absl::InvalidArgumentError(absl::StrFormat(
"Attempt to write vector value failed, address %d out of range", "Attempt to write vector value failed, address %d out of range",
addr)); addr));
} }
for (int i = 0; i < data.size(); i++) { for (int i = 0; i < static_cast<int>(data.size()); i++) {
rom_data_[addr + i] = data[i]; rom_data_[addr + i] = data[i];
} }
core::Logger::log(absl::StrFormat("WriteVector: %#06X: %s", addr, core::Logger::log(absl::StrFormat("WriteVector: %#06X: %s", addr,
@@ -442,7 +443,7 @@ class Rom : public core::ExperimentFlags {
return status; return status;
} }
uint8_t& operator[](int i) { uint8_t& operator[](unsigned long i) {
if (i > size_) { if (i > size_) {
std::cout << "ROM: Index " << i << " out of bounds, size: " << size_ std::cout << "ROM: Index " << i << " out of bounds, size: " << size_
<< std::endl; << std::endl;