summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/devfind.h
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/devfind.h
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/devfind.h')
-rw-r--r--src/emu/devfind.h124
1 files changed, 62 insertions, 62 deletions
diff --git a/src/emu/devfind.h b/src/emu/devfind.h
index b68bea2d46a..094bb5a194c 100644
--- a/src/emu/devfind.h
+++ b/src/emu/devfind.h
@@ -205,7 +205,7 @@ protected:
/// found.
/// \return Base pointer of the memeroy region if a matching region
/// is found, or nullptr otherwise.
- void *find_memregion(uint8_t width, size_t &length, bool required) const;
+ void *find_memregion(u8 width, size_t &length, bool required) const;
/// \brief Check that memory region exists
///
@@ -240,7 +240,7 @@ protected:
/// found.
/// \return Pointer to base of memory share if a matching memory
/// share is found, or nullptr otherwise.
- void *find_memshare(uint8_t width, size_t &bytes, bool required) const;
+ void *find_memshare(u8 width, size_t &bytes, bool required) const;
/// \brief Log if object was not found
///
@@ -646,12 +646,12 @@ public:
/// \brief Get length in units of elements
/// \return Length in units of elements or zero if no matching
/// memory region has been found.
- uint32_t length() const { return m_length; }
+ u32 length() const { return m_length; }
/// \brief Get length in units of bytes
/// \return Length in units of bytes or zero if no matching memory
/// region has been found.
- uint32_t bytes() const { return m_length * sizeof(PointerType); }
+ u32 bytes() const { return m_length * sizeof(PointerType); }
/// \brief Get index mask
///
@@ -659,7 +659,7 @@ public:
/// used as a mask for index values if the length is a power of two.
/// Result is undefined if no matching memory region has been found.
/// \return Length in units of elements minus one.
- uint32_t mask() const { return m_length - 1; }
+ u32 mask() const { return m_length - 1; }
private:
/// \brief Find memory region base pointer
@@ -726,7 +726,7 @@ class shared_ptr_finder : public object_finder_base<PointerType, Required>
{
public:
// construction/destruction
- shared_ptr_finder(device_t &base, char const *tag, uint8_t width = sizeof(PointerType) * 8)
+ shared_ptr_finder(device_t &base, char const *tag, u8 width = sizeof(PointerType) * 8)
: object_finder_base<PointerType, Required>(base, tag)
, m_width(width)
, m_bytes(0)
@@ -738,14 +738,14 @@ public:
PointerType &operator[](int index) const { return this->m_target[index]; }
// getter for explicit fetching
- uint32_t bytes() const { return m_bytes; }
- uint32_t mask() const { return m_bytes - 1; } // FIXME: wrong when sizeof(PointerType) != 1
+ u32 bytes() const { return m_bytes; }
+ u32 mask() const { return m_bytes - 1; } // FIXME: wrong when sizeof(PointerType) != 1
// setter for setting the object
void set_target(PointerType *target, size_t bytes) { this->m_target = target; m_bytes = bytes; }
// dynamic allocation of a shared pointer
- void allocate(uint32_t entries)
+ void allocate(u32 entries)
{
assert(m_allocated.empty());
m_allocated.resize(entries);
@@ -764,7 +764,7 @@ private:
}
// internal state
- uint8_t const m_width;
+ u8 const m_width;
size_t m_bytes;
std::vector<PointerType> m_allocated;
};
@@ -788,23 +788,23 @@ extern template class object_finder_base<memory_bank, true>;
extern template class object_finder_base<ioport_port, false>;
extern template class object_finder_base<ioport_port, true>;
-extern template class object_finder_base<uint8_t, false>;
-extern template class object_finder_base<uint8_t, true>;
-extern template class object_finder_base<uint16_t, false>;
-extern template class object_finder_base<uint16_t, true>;
-extern template class object_finder_base<uint32_t, false>;
-extern template class object_finder_base<uint32_t, true>;
-extern template class object_finder_base<uint64_t, false>;
-extern template class object_finder_base<uint64_t, true>;
-
-extern template class object_finder_base<int8_t, false>;
-extern template class object_finder_base<int8_t, true>;
-extern template class object_finder_base<int16_t, false>;
-extern template class object_finder_base<int16_t, true>;
-extern template class object_finder_base<int32_t, false>;
-extern template class object_finder_base<int32_t, true>;
-extern template class object_finder_base<int64_t, false>;
-extern template class object_finder_base<int64_t, true>;
+extern template class object_finder_base<u8, false>;
+extern template class object_finder_base<u8, true>;
+extern template class object_finder_base<u16, false>;
+extern template class object_finder_base<u16, true>;
+extern template class object_finder_base<u32, false>;
+extern template class object_finder_base<u32, true>;
+extern template class object_finder_base<u64, false>;
+extern template class object_finder_base<u64, true>;
+
+extern template class object_finder_base<s8, false>;
+extern template class object_finder_base<s8, true>;
+extern template class object_finder_base<s16, false>;
+extern template class object_finder_base<s16, true>;
+extern template class object_finder_base<s32, false>;
+extern template class object_finder_base<s32, true>;
+extern template class object_finder_base<s64, false>;
+extern template class object_finder_base<s64, true>;
extern template class memory_region_finder<false>;
extern template class memory_region_finder<true>;
@@ -815,41 +815,41 @@ extern template class memory_bank_finder<true>;
extern template class ioport_finder<false>;
extern template class ioport_finder<true>;
-extern template class region_ptr_finder<uint8_t, false>;
-extern template class region_ptr_finder<uint8_t, true>;
-extern template class region_ptr_finder<uint16_t, false>;
-extern template class region_ptr_finder<uint16_t, true>;
-extern template class region_ptr_finder<uint32_t, false>;
-extern template class region_ptr_finder<uint32_t, true>;
-extern template class region_ptr_finder<uint64_t, false>;
-extern template class region_ptr_finder<uint64_t, true>;
-
-extern template class region_ptr_finder<int8_t, false>;
-extern template class region_ptr_finder<int8_t, true>;
-extern template class region_ptr_finder<int16_t, false>;
-extern template class region_ptr_finder<int16_t, true>;
-extern template class region_ptr_finder<int32_t, false>;
-extern template class region_ptr_finder<int32_t, true>;
-extern template class region_ptr_finder<int64_t, false>;
-extern template class region_ptr_finder<int64_t, true>;
-
-extern template class shared_ptr_finder<uint8_t, false>;
-extern template class shared_ptr_finder<uint8_t, true>;
-extern template class shared_ptr_finder<uint16_t, false>;
-extern template class shared_ptr_finder<uint16_t, true>;
-extern template class shared_ptr_finder<uint32_t, false>;
-extern template class shared_ptr_finder<uint32_t, true>;
-extern template class shared_ptr_finder<uint64_t, false>;
-extern template class shared_ptr_finder<uint64_t, true>;
-
-extern template class shared_ptr_finder<int8_t, false>;
-extern template class shared_ptr_finder<int8_t, true>;
-extern template class shared_ptr_finder<int16_t, false>;
-extern template class shared_ptr_finder<int16_t, true>;
-extern template class shared_ptr_finder<int32_t, false>;
-extern template class shared_ptr_finder<int32_t, true>;
-extern template class shared_ptr_finder<int64_t, false>;
-extern template class shared_ptr_finder<int64_t, true>;
+extern template class region_ptr_finder<u8, false>;
+extern template class region_ptr_finder<u8, true>;
+extern template class region_ptr_finder<u16, false>;
+extern template class region_ptr_finder<u16, true>;
+extern template class region_ptr_finder<u32, false>;
+extern template class region_ptr_finder<u32, true>;
+extern template class region_ptr_finder<u64, false>;
+extern template class region_ptr_finder<u64, true>;
+
+extern template class region_ptr_finder<s8, false>;
+extern template class region_ptr_finder<s8, true>;
+extern template class region_ptr_finder<s16, false>;
+extern template class region_ptr_finder<s16, true>;
+extern template class region_ptr_finder<s32, false>;
+extern template class region_ptr_finder<s32, true>;
+extern template class region_ptr_finder<s64, false>;
+extern template class region_ptr_finder<s64, true>;
+
+extern template class shared_ptr_finder<u8, false>;
+extern template class shared_ptr_finder<u8, true>;
+extern template class shared_ptr_finder<u16, false>;
+extern template class shared_ptr_finder<u16, true>;
+extern template class shared_ptr_finder<u32, false>;
+extern template class shared_ptr_finder<u32, true>;
+extern template class shared_ptr_finder<u64, false>;
+extern template class shared_ptr_finder<u64, true>;
+
+extern template class shared_ptr_finder<s8, false>;
+extern template class shared_ptr_finder<s8, true>;
+extern template class shared_ptr_finder<s16, false>;
+extern template class shared_ptr_finder<s16, true>;
+extern template class shared_ptr_finder<s32, false>;
+extern template class shared_ptr_finder<s32, true>;
+extern template class shared_ptr_finder<s64, false>;
+extern template class shared_ptr_finder<s64, true>;
#endif // MAME_EMU_DEVFIND_H
/** \} */