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

Add new RomTests and fix small bugs in Rom class

Browse Source
This commit is contained in:
scawful
2024-08-14 00:51:43 -04:00
parent 8be5c0cdbe
commit 6c259340f9
3 changed files with 50 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/rom.cc
View File

@@ -143,7 +143,7 @@ absl::Status Rom::LoadAllGraphicsData() {
absl::Status Rom::LoadFromFile(const std::string& filename, bool z3_load) {
std::string full_filename = std::filesystem::absolute(filename).string();
if (full_filename.empty()) {
if (filename.empty()) {
return absl::InvalidArgumentError(
"Could not load ROM: parameter `filename` is empty.");
}
@@ -153,7 +153,7 @@ absl::Status Rom::LoadFromFile(const std::string& filename, bool z3_load) {
// Open file
std::ifstream file(filename_, std::ios::binary);
if (!file.is_open()) {
return absl::InternalError(
return absl::NotFoundError(
absl::StrCat("Could not open ROM file: ", filename_));
}

8
src/app/rom.h
View File

@@ -209,14 +209,14 @@ class Rom : public core::ExperimentFlags {
// Read functions
absl::StatusOr<uint8_t> ReadByte(int offset) {
if (offset >= rom_data_.size()) {
return absl::InvalidArgumentError("Offset out of range");
return absl::FailedPreconditionError("Offset out of range");
}
return rom_data_[offset];
}
absl::StatusOr<uint16_t> ReadWord(int offset) {
if (offset + 1 >= rom_data_.size()) {
return absl::InvalidArgumentError("Offset out of range");
return absl::FailedPreconditionError("Offset out of range");
}
auto result = (uint16_t)(rom_data_[offset] | (rom_data_[offset + 1] << 8));
return result;
@@ -228,7 +228,7 @@ class Rom : public core::ExperimentFlags {
absl::StatusOr<uint32_t> ReadLong(int offset) {
if (offset + 2 >= rom_data_.size()) {
return absl::InvalidArgumentError("Offset out of range");
return absl::FailedPreconditionError("Offset out of range");
}
auto result = (uint32_t)(rom_data_[offset] | (rom_data_[offset + 1] << 8) |
(rom_data_[offset + 2] << 16));
@@ -238,7 +238,7 @@ class Rom : public core::ExperimentFlags {
absl::StatusOr<std::vector<uint8_t>> ReadByteVector(uint32_t offset,
uint32_t length) {
if (offset + length > rom_data_.size()) {
return absl::InvalidArgumentError("Offset and length out of range");
return absl::FailedPreconditionError("Offset and length out of range");
}
std::vector<uint8_t> result;
for (int i = offset; i < offset + length; i++) {