imports/imhex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-04-02 21:47:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

impr: Added better error messages to intel hex and motorola srec providers

Browse Source
This commit is contained in:
WerWolv
2024-05-10 23:01:36 +02:00
parent d727100304
commit 90a67af887
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/builtin/source/content/providers/intel_hex_provider.cpp
View File

@@ -9,6 +9,7 @@
#include <nlohmann/json.hpp>
#include <wolv/io/file.hpp>
#include <wolv/utils/expected.hpp>
#include <wolv/utils/string.hpp>
namespace hex::plugin::builtin {
@@ -26,7 +27,7 @@ namespace hex::plugin::builtin {
throw std::runtime_error("Failed to parse hex digit");
}
std::map<u64, std::vector<u8>> parseIntelHex(const std::string &string) {
wolv::util::Expected<std::map<u64, std::vector<u8>>, std::string> parseIntelHex(const std::string &string) {
std::map<u64, std::vector<u8>> result;
u8 checksum = 0x00;
@@ -148,8 +149,8 @@ namespace hex::plugin::builtin {
offset++;
}
} catch (const std::runtime_error &) {
return { };
} catch (const std::runtime_error &e) {
return wolv::util::Unexpected<std::string>(e.what());
}
return result;
@@ -193,12 +194,16 @@ namespace hex::plugin::builtin {
bool IntelHexProvider::open() {
auto file = wolv::io::File(m_sourceFilePath, wolv::io::File::Mode::Read);
if (!file.isValid())
if (!file.isValid()) {
this->setErrorMessage(hex::format("hex.builtin.provider.file.error.open"_lang, m_sourceFilePath.string(), ::strerror(errno)));
return false;
}
auto data = intel_hex::parseIntelHex(file.readString());
if (data.empty())
if (!data.has_value()) {
this->setErrorMessage(data.error());
return false;
}
u64 maxAddress = 0x00;
for (auto &[address, bytes] : data) {

15
plugins/builtin/source/content/providers/motorola_srec_provider.cpp
View File

@@ -7,6 +7,7 @@
#include <wolv/io/file.hpp>
#include <wolv/io/fs.hpp>
#include <wolv/utils/expected.hpp>
#include <wolv/utils/string.hpp>
namespace hex::plugin::builtin {
@@ -24,7 +25,7 @@ namespace hex::plugin::builtin {
throw std::runtime_error("Failed to parse hex digit");
}
std::map<u64, std::vector<u8>> parseMotorolaSREC(const std::string &string) {
wolv::util::Expected<std::map<u64, std::vector<u8>>, std::string> parseMotorolaSREC(const std::string &string) {
std::map<u64, std::vector<u8>> result;
u64 offset = 0x00;
@@ -161,8 +162,8 @@ namespace hex::plugin::builtin {
while (std::isspace(string[offset]) && offset < string.length())
offset++;
}
} catch (const std::runtime_error &) {
return { };
} catch (const std::runtime_error &e) {
return wolv::util::Unexpected<std::string>(e.what());
}
return result;
@@ -172,12 +173,16 @@ namespace hex::plugin::builtin {
bool MotorolaSRECProvider::open() {
auto file = wolv::io::File(m_sourceFilePath, wolv::io::File::Mode::Read);
if (!file.isValid())
if (!file.isValid()) {
this->setErrorMessage(hex::format("hex.builtin.provider.file.error.open"_lang, m_sourceFilePath.string(), ::strerror(errno)));
return false;
}
auto data = motorola_srec::parseMotorolaSREC(file.readString());
if (data.empty())
if (!data.has_value()) {
this->setErrorMessage(data.error());
return false;
}
u64 maxAddress = 0x00;
for (auto &[address, bytes] : data) {