summaryrefslogtreecommitdiffstats
path: root/src/emu/save.cpp
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2016-11-19 05:35:54 +1100
committer Vas Crabb <vas@vastheman.com>2016-11-19 05:38:48 +1100
commit8179a84458204a5e767446fcf7d10f032a40fd0c (patch)
tree16105e1667f811dcb24dbf0fc255166cb06df5c2 /src/emu/save.cpp
parent1b489fe83034072149fb0637b20c7ba57dc72a7a (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/save.cpp')
-rw-r--r--src/emu/save.cpp50
1 files changed, 25 insertions, 25 deletions
diff --git a/src/emu/save.cpp b/src/emu/save.cpp
index 4a94c9baea1..c85f0d1b9ef 100644
--- a/src/emu/save.cpp
+++ b/src/emu/save.cpp
@@ -86,7 +86,7 @@ void save_manager::allow_registration(bool allowed)
// index
//-------------------------------------------------
-const char *save_manager::indexed_item(int index, void *&base, uint32_t &valsize, uint32_t &valcount) const
+const char *save_manager::indexed_item(int index, void *&base, u32 &valsize, u32 &valcount) const
{
if (index >= m_entry_list.size() || index < 0)
return nullptr;
@@ -147,7 +147,7 @@ void save_manager::register_postload(save_prepost_delegate func)
// memory
//-------------------------------------------------
-void save_manager::save_memory(device_t *device, const char *module, const char *tag, uint32_t index, const char *name, void *val, uint32_t valsize, uint32_t valcount)
+void save_manager::save_memory(device_t *device, const char *module, const char *tag, u32 index, const char *name, void *val, u32 valsize, u32 valcount)
{
assert(valsize == 1 || valsize == 2 || valsize == 4 || valsize == 8);
@@ -195,13 +195,13 @@ void save_manager::save_memory(device_t *device, const char *module, const char
save_error save_manager::check_file(running_machine &machine, emu_file &file, const char *gamename, void (CLIB_DECL *errormsg)(const char *fmt, ...))
{
// if we want to validate the signature, compute it
- uint32_t sig;
+ u32 sig;
sig = machine.save().signature();
// seek to the beginning and read the header
file.compress(FCOMPRESS_NONE);
file.seek(0, SEEK_SET);
- uint8_t header[HEADER_SIZE];
+ u8 header[HEADER_SIZE];
if (file.read(header, sizeof(header)) != sizeof(header))
{
if (errormsg != nullptr)
@@ -238,13 +238,13 @@ save_error save_manager::read_file(emu_file &file)
// read the header and turn on compression for the rest of the file
file.compress(FCOMPRESS_NONE);
file.seek(0, SEEK_SET);
- uint8_t header[HEADER_SIZE];
+ u8 header[HEADER_SIZE];
if (file.read(header, sizeof(header)) != sizeof(header))
return STATERR_READ_ERROR;
file.compress(FCOMPRESS_MEDIUM);
// verify the header and report an error if it doesn't match
- uint32_t sig = signature();
+ u32 sig = signature();
if (validate_header(header, machine().system().name, sig, nullptr, "Error: ") != STATERR_NONE)
return STATERR_INVALID_HEADER;
@@ -254,7 +254,7 @@ save_error save_manager::read_file(emu_file &file)
// read all the data, flipping if necessary
for (auto &entry : m_entry_list)
{
- uint32_t totalsize = entry->m_typesize * entry->m_typecount;
+ u32 totalsize = entry->m_typesize * entry->m_typecount;
if (file.read(entry->m_data, totalsize) != totalsize)
return STATERR_READ_ERROR;
@@ -292,13 +292,13 @@ save_error save_manager::write_file(emu_file &file)
return STATERR_ILLEGAL_REGISTRATIONS;
// generate the header
- uint8_t header[HEADER_SIZE];
+ u8 header[HEADER_SIZE];
memcpy(&header[0], STATE_MAGIC_NUM, 8);
header[8] = SAVE_VERSION;
header[9] = NATIVE_ENDIAN_VALUE_LE_BE(0, SS_MSB_FIRST);
strncpy((char *)&header[0x0a], machine().system().name, 0x1c - 0x0a);
- uint32_t sig = signature();
- *(uint32_t *)&header[0x1c] = little_endianize_int32(sig);
+ u32 sig = signature();
+ *(u32 *)&header[0x1c] = little_endianize_int32(sig);
// write the header and turn on compression for the rest of the file
file.compress(FCOMPRESS_NONE);
@@ -313,7 +313,7 @@ save_error save_manager::write_file(emu_file &file)
// then write all the data
for (auto &entry : m_entry_list)
{
- uint32_t totalsize = entry->m_typesize * entry->m_typecount;
+ u32 totalsize = entry->m_typesize * entry->m_typecount;
if (file.write(entry->m_data, totalsize) != totalsize)
return STATERR_WRITE_ERROR;
}
@@ -326,20 +326,20 @@ save_error save_manager::write_file(emu_file &file)
// is a CRC over the structure of the data
//-------------------------------------------------
-uint32_t save_manager::signature() const
+u32 save_manager::signature() const
{
// iterate over entries
- uint32_t crc = 0;
+ u32 crc = 0;
for (auto &entry : m_entry_list)
{
// add the entry name to the CRC
- crc = core_crc32(crc, (uint8_t *)entry->m_name.c_str(), entry->m_name.length());
+ crc = core_crc32(crc, (u8 *)entry->m_name.c_str(), entry->m_name.length());
// add the type and size to the CRC
- uint32_t temp[2];
+ u32 temp[2];
temp[0] = little_endianize_int32(entry->m_typecount);
temp[1] = little_endianize_int32(entry->m_typesize);
- crc = core_crc32(crc, (uint8_t *)&temp[0], sizeof(temp));
+ crc = core_crc32(crc, (u8 *)&temp[0], sizeof(temp));
}
return crc;
}
@@ -362,7 +362,7 @@ void save_manager::dump_registry() const
// header
//-------------------------------------------------
-save_error save_manager::validate_header(const uint8_t *header, const char *gamename, uint32_t signature,
+save_error save_manager::validate_header(const u8 *header, const char *gamename, u32 signature,
void (CLIB_DECL *errormsg)(const char *fmt, ...), const char *error_prefix)
{
// check magic number
@@ -392,7 +392,7 @@ save_error save_manager::validate_header(const uint8_t *header, const char *game
// check signature, if we were asked to
if (signature != 0)
{
- uint32_t rawsig = *(uint32_t *)&header[0x1c];
+ u32 rawsig = *(u32 *)&header[0x1c];
if (signature != little_endianize_int32(rawsig))
{
if (errormsg != nullptr)
@@ -418,7 +418,7 @@ save_manager::state_callback::state_callback(save_prepost_delegate callback)
// state_entry - constructor
//-------------------------------------------------
-state_entry::state_entry(void *data, const char *name, device_t *device, const char *module, const char *tag, int index, uint8_t size, uint32_t count)
+state_entry::state_entry(void *data, const char *name, device_t *device, const char *module, const char *tag, int index, u8 size, u32 count)
: m_data(data),
m_name(name),
m_device(device),
@@ -439,27 +439,27 @@ state_entry::state_entry(void *data, const char *name, device_t *device, const c
void state_entry::flip_data()
{
- uint16_t *data16;
- uint32_t *data32;
- uint64_t *data64;
+ u16 *data16;
+ u32 *data32;
+ u64 *data64;
int count;
switch (m_typesize)
{
case 2:
- data16 = (uint16_t *)m_data;
+ data16 = (u16 *)m_data;
for (count = 0; count < m_typecount; count++)
data16[count] = flipendian_int16(data16[count]);
break;
case 4:
- data32 = (uint32_t *)m_data;
+ data32 = (u32 *)m_data;
for (count = 0; count < m_typecount; count++)
data32[count] = flipendian_int32(data32[count]);
break;
case 8:
- data64 = (uint64_t *)m_data;
+ data64 = (u64 *)m_data;
for (count = 0; count < m_typecount; count++)
data64[count] = flipendian_int64(data64[count]);
break;