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

add print debugging and try catch to Rom::LoadFromFile

Browse Source
This commit is contained in:
scawful
2024-05-28 19:10:38 -04:00
parent 3201f0c152
commit 563863a924
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/rom.cc
View File

@@ -127,6 +127,7 @@ absl::Status Rom::LoadAllGraphicsData() {
} }
absl::Status Rom::LoadFromFile(const std::string& filename, bool z3_load) { absl::Status Rom::LoadFromFile(const std::string& filename, bool z3_load) {
std::cout << "Loading ROM: " << filename << std::endl;
if (filename.empty()) { if (filename.empty()) {
return absl::InvalidArgumentError( return absl::InvalidArgumentError(
"Could not load ROM: parameter `filename` is empty."); "Could not load ROM: parameter `filename` is empty.");
@@ -142,7 +143,14 @@ absl::Status Rom::LoadFromFile(const std::string& filename, bool z3_load) {
} }
// Get file size and resize rom_data_ // Get file size and resize rom_data_
std::cout << "Getting file size" << std::endl;
try {
size_ = std::filesystem::file_size(filename_); size_ = std::filesystem::file_size(filename_);
} catch (const std::filesystem::filesystem_error& e) {
return absl::InternalError(
absl::StrCat("Could not get file size: ", filename, " - ", e.what()));
}
std::cout << "Size of file: " << size_ << std::endl;
rom_data_.resize(size_); rom_data_.resize(size_);
// Read file into rom_data_ // Read file into rom_data_
@@ -152,6 +160,7 @@ absl::Status Rom::LoadFromFile(const std::string& filename, bool z3_load) {
constexpr size_t baseROMSize = 1048576; // 1MB constexpr size_t baseROMSize = 1048576; // 1MB
constexpr size_t headerSize = 0x200; // 512 bytes constexpr size_t headerSize = 0x200; // 512 bytes
if (size_ % baseROMSize == headerSize) { if (size_ % baseROMSize == headerSize) {
std::cout << "ROM has a header" << std::endl;
has_header_ = true; has_header_ = true;
} }
@@ -168,6 +177,7 @@ absl::Status Rom::LoadFromFile(const std::string& filename, bool z3_load) {
// Load Zelda 3 specific data if requested // Load Zelda 3 specific data if requested
if (z3_load) { if (z3_load) {
std::cout << "Loading Zelda 3 specific data" << std::endl;
// Copy ROM title // Copy ROM title
constexpr uint32_t kTitleStringOffset = 0x7FC0; constexpr uint32_t kTitleStringOffset = 0x7FC0;
constexpr uint32_t kTitleStringLength = 20; constexpr uint32_t kTitleStringLength = 20;
@@ -185,6 +195,9 @@ absl::Status Rom::LoadFromFile(const std::string& filename, bool z3_load) {
rom_data_.resize(baseROMSize * 2); rom_data_.resize(baseROMSize * 2);
size_ = baseROMSize * 2; size_ = baseROMSize * 2;
std::cout
<< "ROM loaded successfully, attempting to create resource label file."
<< std::endl;
// Set up the resource labels // Set up the resource labels
std::string resource_label_filename = absl::StrFormat("%s.labels", filename); std::string resource_label_filename = absl::StrFormat("%s.labels", filename);
resource_label_manager_.LoadLabels(resource_label_filename); resource_label_manager_.LoadLabels(resource_label_filename);