summaryrefslogtreecommitdiffstatshomepage
path: root/src/tools/unidasm.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools/unidasm.cpp')
-rw-r--r--src/tools/unidasm.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/tools/unidasm.cpp b/src/tools/unidasm.cpp
index 14e7dbf2c6d..dca4793aeac 100644
--- a/src/tools/unidasm.cpp
+++ b/src/tools/unidasm.cpp
@@ -185,6 +185,7 @@ using util::BIT;
#include "cpu/v60/v60d.h"
#include "cpu/v810/v810dasm.h"
#include "cpu/v850/v850dasm.h"
+#include "cpu/vax/vaxdasm.h"
#include "cpu/vt50/vt50dasm.h"
#include "cpu/vt61/vt61dasm.h"
#include "cpu/we32000/we32100d.h"
@@ -197,6 +198,7 @@ using util::BIT;
#include "corefile.h"
#include "corestr.h"
#include "eminline.h"
+#include "endianness.h"
#include <algorithm>
#include <cctype>
@@ -334,12 +336,13 @@ struct nec_unidasm_t : nec_disassembler::config
} nec_unidasm;
-enum endianness { le, be };
+static constexpr auto le = util::endianness::little;
+static constexpr auto be = util::endianness::big;
struct dasm_table_entry
{
const char * name;
- endianness endian;
+ util::endianness endian;
int8_t pcshift;
std::function<util::disasm_interface *()> alloc;
};
@@ -636,6 +639,7 @@ static const dasm_table_entry dasm_table[] =
{ "v850", le, 0, []() -> util::disasm_interface * { return new v850_disassembler; } },
{ "v850es", le, 0, []() -> util::disasm_interface * { return new v850es_disassembler; } },
{ "v850e2", le, 0, []() -> util::disasm_interface * { return new v850e2_disassembler; } },
+ { "vax", le, 0, []() -> util::disasm_interface * { return new vax_disassembler; } },
{ "vt50", le, 0, []() -> util::disasm_interface * { return new vt50_disassembler; } },
{ "vt52", le, 0, []() -> util::disasm_interface * { return new vt52_disassembler; } },
{ "vt61", le, -1, []() -> util::disasm_interface * { return new vt61_disassembler; } },
@@ -1219,9 +1223,9 @@ int main(int argc, char *argv[])
void *data = nullptr;
u32 length = 0;
if(std::strcmp(opts.filename, "-") != 0) {
- osd_file::error filerr = util::core_file::load(opts.filename, &data, length);
- if(filerr != osd_file::error::NONE) {
- std::fprintf(stderr, "Error opening file '%s'\n", opts.filename);
+ std::error_condition filerr = util::core_file::load(opts.filename, &data, length);
+ if(filerr) {
+ std::fprintf(stderr, "Error opening file '%s' (%s)\n", opts.filename, filerr.message().c_str());
return 1;
}
}