diff options
author | 2016-11-19 05:35:54 +1100 | |
---|---|---|
committer | 2016-11-19 05:38:48 +1100 | |
commit | 8179a84458204a5e767446fcf7d10f032a40fd0c (patch) | |
tree | 16105e1667f811dcb24dbf0fc255166cb06df5c2 /src/emu/softlist.cpp | |
parent | 1b489fe83034072149fb0637b20c7ba57dc72a7a (diff) |
Introduce u8/u16/u32/u64/s8/s16/s32/s64
* New abbreviated types are in osd and util namespaces, and also in global namespace for things that #include "emu.h"
* Get rid of import of cstdint types to global namespace (C99 does this anyway)
* Remove the cstdint types from everything in emu
* Get rid of U64/S64 macros
* Fix a bug in dps16 caused by incorrect use of macro
* Fix debugcon not checking for "do " prefix case-insensitively
* Fix a lot of messed up tabulation
* More constexpr
* Fix up many __names
Diffstat (limited to 'src/emu/softlist.cpp')
-rw-r--r-- | src/emu/softlist.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/emu/softlist.cpp b/src/emu/softlist.cpp index bb03a9e2800..5182881274a 100644 --- a/src/emu/softlist.cpp +++ b/src/emu/softlist.cpp @@ -204,7 +204,7 @@ softlist_parser::softlist_parser(util::core_file &file, const std::string &filen char buffer[1024]; while (!m_done) { - uint32_t length = m_file.read(buffer, sizeof(buffer)); + u32 length = m_file.read(buffer, sizeof(buffer)); m_done = m_file.eof(); if (XML_Parse(m_parser, buffer, length, m_done) == XML_STATUS_ERROR) { @@ -341,7 +341,7 @@ bool softlist_parser::parse_name_and_value(const char **attributes, std::string // current part's list //------------------------------------------------- -void softlist_parser::add_rom_entry(std::string &&name, std::string &&hashdata, uint32_t offset, uint32_t length, uint32_t flags) +void softlist_parser::add_rom_entry(std::string &&name, std::string &&hashdata, u32 offset, u32 length, u32 flags) { // get the current part if (m_current_part == nullptr) @@ -597,7 +597,7 @@ void softlist_parser::parse_part_start(const char *tagname, const char **attribu // handle region attributes const std::string &width = attrvalues[2]; const std::string &endianness = attrvalues[3]; - uint32_t regionflags = ROMENTRYTYPE_REGION; + u32 regionflags = ROMENTRYTYPE_REGION; if (!width.empty()) { @@ -689,8 +689,8 @@ void softlist_parser::parse_data_start(const char *tagname, const char **attribu const std::string &loadflag = attrvalues[7]; if (!sizestr.empty() && !offsetstr.empty()) { - uint32_t length = strtol(sizestr.c_str(), nullptr, 0); - uint32_t offset = strtol(offsetstr.c_str(), nullptr, 0); + u32 length = strtol(sizestr.c_str(), nullptr, 0); + u32 offset = strtol(offsetstr.c_str(), nullptr, 0); if (loadflag == "reload") add_rom_entry("", "", offset, length, ROMENTRYTYPE_RELOAD | ROM_INHERITFLAGS); @@ -740,7 +740,7 @@ void softlist_parser::parse_data_start(const char *tagname, const char **attribu } else if (!sizestr.empty() && !loadflag.empty() && loadflag == "ignore") { - uint32_t length = strtol(sizestr.c_str(), nullptr, 0); + u32 length = strtol(sizestr.c_str(), nullptr, 0); add_rom_entry("", "", 0, length, ROMENTRYTYPE_IGNORE | ROM_INHERITFLAGS); } else |