summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2017-04-16 18:39:15 -0400
committer AJR <ajrhacker@users.noreply.github.com>2017-04-16 18:39:18 -0400
commitdfdd5be76cb87aa5c3ff546fb8efc8d92721d795 (patch)
treee894a85ac8790cf508b71ab9a1817d2ee46d382b /src/emu
parented4926d53464daa067d4a656ff1c765fc72bc8bf (diff)
Disallow a negative number of palette entries by changing some types (nw)
Diffstat (limited to 'src/emu')
-rw-r--r--src/emu/dipalette.cpp4
-rw-r--r--src/emu/dipalette.h10
-rw-r--r--src/emu/emupal.cpp4
-rw-r--r--src/emu/emupal.h12
4 files changed, 15 insertions, 15 deletions
diff --git a/src/emu/dipalette.cpp b/src/emu/dipalette.cpp
index 86af84d8085..d996ccafe4d 100644
--- a/src/emu/dipalette.cpp
+++ b/src/emu/dipalette.cpp
@@ -62,7 +62,7 @@ void device_palette_interface::interface_pre_start()
m_format = (screen != nullptr) ? screen->format() : BITMAP_FORMAT_INVALID;
// allocate the palette
- int numentries = palette_entries();
+ u32 numentries = palette_entries();
allocate_palette(numentries);
allocate_color_tables();
allocate_shadow_tables();
@@ -339,7 +339,7 @@ void device_palette_interface::set_shadow_dRGB32(int mode, int dr, int dg, int d
// palette object itself
//-------------------------------------------------
-void device_palette_interface::allocate_palette(int numentries)
+void device_palette_interface::allocate_palette(u32 numentries)
{
assert(numentries > 0);
diff --git a/src/emu/dipalette.h b/src/emu/dipalette.h
index 4a1e5ea7d8d..fc1f767300d 100644
--- a/src/emu/dipalette.h
+++ b/src/emu/dipalette.h
@@ -46,8 +46,8 @@ public:
device_palette_interface(const machine_config &mconfig, device_t &device);
// getters
- int entries() const { return palette_entries(); }
- int indirect_entries() const { return palette_indirect_entries(); }
+ u32 entries() const { return palette_entries(); }
+ u32 indirect_entries() const { return palette_indirect_entries(); }
palette_t *palette() const { return m_palette; }
const pen_t &pen(int index) const { return m_pens[index]; }
const pen_t *pens() const { return m_pens; }
@@ -91,14 +91,14 @@ protected:
virtual void interface_post_stop() override;
// configuration-related overrides
- virtual int palette_entries() const = 0;
- virtual int palette_indirect_entries() const { return 0; }
+ virtual u32 palette_entries() const = 0;
+ virtual u32 palette_indirect_entries() const { return 0; }
virtual bool palette_shadows_enabled() const { return false; }
virtual bool palette_hilights_enabled() const { return false; }
private:
// internal helpers
- void allocate_palette(int numentries);
+ void allocate_palette(u32 numentries);
void allocate_color_tables();
void allocate_shadow_tables();
public: // needed by konamigx
diff --git a/src/emu/emupal.cpp b/src/emu/emupal.cpp
index a2567d47250..13e4b329e91 100644
--- a/src/emu/emupal.cpp
+++ b/src/emu/emupal.cpp
@@ -66,13 +66,13 @@ void palette_device::static_set_endianness(device_t &device, endianness_t endian
}
-void palette_device::static_set_entries(device_t &device, int entries)
+void palette_device::static_set_entries(device_t &device, u32 entries)
{
downcast<palette_device &>(device).m_entries = entries;
}
-void palette_device::static_set_indirect_entries(device_t &device, int entries)
+void palette_device::static_set_indirect_entries(device_t &device, u32 entries)
{
downcast<palette_device &>(device).m_indirect_entries = entries;
}
diff --git a/src/emu/emupal.h b/src/emu/emupal.h
index 31f6937fb52..fe8a9b084b9 100644
--- a/src/emu/emupal.h
+++ b/src/emu/emupal.h
@@ -367,8 +367,8 @@ public:
static void static_set_format(device_t &device, raw_to_rgb_converter raw_to_rgb);
static void static_set_membits(device_t &device, int membits);
static void static_set_endianness(device_t &device, endianness_t endianness);
- static void static_set_entries(device_t &device, int entries);
- static void static_set_indirect_entries(device_t &device, int entries);
+ static void static_set_entries(device_t &device, u32 entries);
+ static void static_set_indirect_entries(device_t &device, u32 entries);
static void static_enable_shadows(device_t &device);
static void static_enable_hilights(device_t &device);
@@ -421,8 +421,8 @@ protected:
virtual void device_start() override;
// device_palette_interface overrides
- virtual int palette_entries() const override { return m_entries; }
- virtual int palette_indirect_entries() const override { return m_indirect_entries; }
+ virtual u32 palette_entries() const override { return m_entries; }
+ virtual u32 palette_indirect_entries() const override { return m_indirect_entries; }
virtual bool palette_shadows_enabled() const override { return m_enable_shadows; }
virtual bool palette_hilights_enabled() const override { return m_enable_hilights; }
@@ -430,8 +430,8 @@ private:
void update_for_write(offs_t byte_offset, int bytes_modified, bool indirect = false);
// configuration state
- int m_entries; // number of entries in the palette
- int m_indirect_entries; // number of indirect colors in the palette
+ u32 m_entries; // number of entries in the palette
+ u32 m_indirect_entries; // number of indirect colors in the palette
bool m_enable_shadows; // are shadows enabled?
bool m_enable_hilights; // are hilights enabled?
int m_membits; // width of palette RAM, if different from native