Code clean-up

dingusdev · dingusdev · commit 77503df6777e · 2025-03-12T07:58:32.000-07:00
diff --git a/core/mathutils.h b/core/mathutils.h
@@ -19,6 +19,8 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+#include <cstdint>
+
 #ifndef MATH_UTILS_H
 #define MATH_UTILS_H
 
diff --git a/core/timermanager.h b/core/timermanager.h
@@ -31,11 +31,11 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <vector>
 #include <mutex>
 
-#define NS_PER_SEC      1000000000
-#define USEC_PER_SEC    1000000
-#define NS_PER_USEC     1000
-#define NS_PER_MSEC     1000000
-#define ONE_BILLION_NS  1000000000
+constexpr auto NS_PER_SEC     = 1000000000;
+constexpr auto USEC_PER_SEC   = 1000000;
+constexpr auto NS_PER_USEC    = 1000;
+constexpr auto NS_PER_MSEC    = 1000000;
+constexpr auto ONE_BILLION_NS = 1000000000;
 
 #define USECS_TO_NSECS(us) (us) * NS_PER_USEC
 #define MSECS_TO_NSECS(ms) (ms) * NS_PER_MSEC
diff --git a/debugger/debugger.cpp b/debugger/debugger.cpp
@@ -112,7 +112,7 @@ static void show_help() {
 
 static uint32_t disasm_68k(uint32_t count, uint32_t address) {
     csh cs_handle;
-    uint8_t code[12];
+    uint8_t code[12]{};
     size_t code_size;
     uint64_t dis_addr;
 
@@ -160,7 +160,7 @@ static uint32_t disasm_68k(uint32_t count, uint32_t address) {
 }
 
 /* emulator opcode table size --> 512 KB */
-#define EMU_68K_TABLE_SIZE 0x80000
+constexpr auto EMU_68K_TABLE_SIZE = 0x80000;
 
 /** Execute one emulated 68k instruction. */
 void exec_single_68k()
@@ -476,7 +476,7 @@ void DppcDebugger::enter_debugger() {
     uint32_t next_addr_68k;
 #endif
     bool cmd_repeat;
-    int repeat_count;
+    int repeat_count = 0;
 
     unique_ptr<OfConfigUtils> ofnvram = unique_ptr<OfConfigUtils>(new OfConfigUtils);
 
diff --git a/devices/common/adb/adbbus.h b/devices/common/adb/adbbus.h
@@ -30,7 +30,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <string>
 #include <vector>
 
-#define ADB_MAX_DATA_SIZE   8
+constexpr auto ADB_MAX_DATA_SIZE = 8;
 
 /** ADB status. */
 enum {
diff --git a/devices/common/ata/atabasedevice.h b/devices/common/ata/atabasedevice.h
@@ -71,7 +71,9 @@ class AtaBaseDevice : public HWComponent, public AtaInterface
     }
 
 protected:
-    bool is_selected() { return ((this->r_dev_head >> 4) & 1) == this->my_dev_id; };
+    bool is_selected() const {
+        return ((this->r_dev_head >> 4) & 1) == this->my_dev_id;
+    };
 
     void prepare_xfer(int xfer_size, int block_size);
 
@@ -82,7 +84,7 @@ class AtaBaseDevice : public HWComponent, public AtaInterface
     IdeChannel* host_obj = nullptr;
 
     // IDE aka task file registers
-    uint8_t r_error;
+    uint8_t r_error = 0;
     uint8_t r_features;
     uint8_t r_sect_count;
     uint8_t r_sect_num;
diff --git a/devices/common/ata/atahd.h b/devices/common/ata/atahd.h
@@ -29,15 +29,15 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 #include <string>
 
-#define ATA_HD_SEC_SIZE 512
-#define SECTORS_PER_INT 16
+constexpr auto ATA_HD_SEC_SIZE = 512;
+constexpr auto SECTORS_PER_INT = 16;
 
 // C:16383 x H:16 x S:63 = C:1032 x H:254 x S:63 = 8063.5078125 MiB = 8.46 GB
-#define ATA_BIOS_LIMIT  16514064
+constexpr auto ATA_BIOS_LIMIT = 16514064;
 // C:65535 x H:16 x S:255 = 127.498 GiB = 136.900 GB = largest identify
-#define REAL_CHS_LIMIT  267382800
+constexpr auto REAL_CHS_LIMIT = 267382800;
 // C:65536 x H:16 x S:255 = 127.500 GiB = 136.902 GB = largest address
-#define CHS_LIMIT       267386880
+constexpr auto CHS_LIMIT = 267386880;
 
 class AtaHardDisk : public AtaBaseDevice
 {
diff --git a/devices/common/ata/cmd646.h b/devices/common/ata/cmd646.h
@@ -31,14 +31,14 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 #include <memory>
 
-#define DEV_ID_CMD646   0x646
-#define MY_DEV_CLASS    0x010180 // mass storage | IDE controller | IDE master
-#define MY_REV_ID       7
+constexpr auto DEV_ID_CMD646 = 0x646;
+constexpr auto MY_DEV_CLASS  = 0x010180;    // mass storage | IDE controller | IDE master;
+constexpr auto MY_REV_ID     = 7;
 
 // Offset for converting addresses of the device control block registers
 // defined in the PCI IDE Controller specification, rev. 1.0 3/4/94
 // to the addresses used in IdeChannel
-#define DEV_CTRL_BLK_OFFSET 0x14
+constexpr auto DEV_CTRL_BLK_OFFSET = 0x14;
 
 /** CMD646 control/status registers. */
 enum {
diff --git a/devices/common/clockgen/athens.h b/devices/common/clockgen/athens.h
@@ -29,7 +29,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 #include <cinttypes>
 
-#define ATHENS_NUM_REGS 8
+constexpr auto ATHENS_NUM_REGS = 8;
 
 /** Default external crystal oscillator frequency. */
 constexpr auto ATHENS_XTAL = 31334400.0f;
diff --git a/devices/common/ofnvram.h b/devices/common/ofnvram.h
@@ -33,9 +33,9 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 class NVram;
 
 /** ========== Apple Open Firmware 1.x/2.x partition definitions. ========== */
-#define OF_NVRAM_OFFSET 0x1800
-#define OF_NVRAM_SIG    0x1275
-#define OF_CFG_SIZE     0x800
+constexpr auto OF_NVRAM_OFFSET = 0x1800;
+constexpr auto OF_NVRAM_SIG = 0x1275;
+constexpr auto OF_CFG_SIZE = 0x800;
 
 // OF Variable types
 enum {
diff --git a/devices/common/pci/bandit.h b/devices/common/pci/bandit.h
@@ -46,8 +46,8 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <memory>
 #include <string>
 
-#define BANDIT_DEV          (11)       // Bandit's own device number
-#define BANDIT_CAR_TYPE     (1 << 0)   // Bandit config address type bit
+constexpr auto BANDIT_DEV      = (11);       // Bandit's own device number;
+constexpr auto BANDIT_CAR_TYPE = (1 << 0);    // Bandit config address type bit;
 
 /* Convenient macros for parsing CONFIG_ADDR fields. */
 #define BUS_NUM()   ((this->config_addr >> 16) & 0xFFU)
diff --git a/devices/common/scsi/sc53c94.cpp b/devices/common/scsi/sc53c94.cpp
@@ -380,7 +380,7 @@ void Sc53C94::exec_next_command()
     }
 }
 
-#define DATA_FIFO_MAX   16
+constexpr auto DATA_FIFO_MAX = 16;
 
 void Sc53C94::fifo_push(const uint8_t data)
 {
@@ -433,7 +433,7 @@ void Sc53C94::sequencer()
     case SeqState::BUS_FREE:
         if (this->bus_obj->current_phase() == ScsiPhase::BUS_FREE) {
             this->next_state = SeqState::ARB_BEGIN;
-            this->seq_defer_state(BUS_FREE_DELAY + BUS_SETTLE_DELAY);
+            this->seq_defer_state(uint64_t(BUS_FREE_DELAY) + BUS_SETTLE_DELAY);
         } else { // continue waiting
             this->next_state = SeqState::BUS_FREE;
             this->seq_defer_state(BUS_FREE_DELAY);
@@ -453,7 +453,7 @@ void Sc53C94::sequencer()
     case SeqState::ARB_END:
         if (this->bus_obj->end_arbitration(this->my_bus_id)) { // arbitration won
             this->next_state = this->cmd_steps->next_step;
-            this->seq_defer_state(BUS_CLEAR_DELAY + BUS_SETTLE_DELAY);
+            this->seq_defer_state(uint64_t(BUS_CLEAR_DELAY) + BUS_SETTLE_DELAY);
         } else { // arbitration lost
             LOG_F(INFO, "%s: arbitration lost!", this->name.c_str());
             this->bus_obj->release_ctrl_lines(this->my_bus_id);
diff --git a/devices/common/scsi/scsi.h b/devices/common/scsi/scsi.h
@@ -156,14 +156,14 @@ enum ScsiError : int {
 };
 
 /** Standard SCSI bus timing values measured in ns. */
-#define BUS_SETTLE_DELAY    400
-#define BUS_FREE_DELAY      800
-#define BUS_CLEAR_DELAY     800
-#define ARB_DELAY           2400
-#define SEL_ABORT_TIME      200000
-#define SEL_TIME_OUT        250000000
+constexpr auto BUS_SETTLE_DELAY = 400;
+constexpr auto BUS_FREE_DELAY   = 800;
+constexpr auto BUS_CLEAR_DELAY  = 800;
+constexpr auto ARB_DELAY        = 2400;
+constexpr auto SEL_ABORT_TIME   = 200000;
+constexpr auto SEL_TIME_OUT     = 250000000;
 
-#define SCSI_MAX_DEVS   8
+constexpr auto SCSI_MAX_DEVS    = 8;
 
 class ScsiBus;
 
@@ -246,9 +246,18 @@ class ScsiBus : public HWComponent {
 
     // low-level state management
     void    register_device(int id, ScsiDevice* dev_obj);
-    int     current_phase() { return this->cur_phase; };
-    int     get_initiator_id() { return this->initiator_id; };
-    int     get_target_id() { return this->target_id; };
+
+    int current_phase() const {
+        return this->cur_phase;
+    };
+
+    int get_initiator_id() const {
+        return this->initiator_id;
+    };
+
+    int get_target_id() const {
+        return this->target_id;
+    };
 
     // reading/writing control lines
     void        assert_ctrl_line(int id, uint16_t mask);
diff --git a/devices/common/scsi/scsibusctrl.h b/devices/common/scsi/scsibusctrl.h
@@ -58,7 +58,7 @@ enum : int {
     SEL_TIMEOUT,
 };
 
-#define DATA_FIFO_DEPTH 16
+constexpr auto DATA_FIFO_DEPTH = 16;
 
 class ScsiBusController : public ScsiDevice, public DmaDevice {
 public:
diff --git a/devices/common/viacuda.h b/devices/common/viacuda.h
@@ -53,7 +53,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 class AdbBus;
 class InterruptCtrl;
 
-#define VIA_CLOCK_HZ 783360
+constexpr auto VIA_CLOCK_HZ = 783360;
 
 /** VIA register offsets. */
 enum {
@@ -143,16 +143,16 @@ enum {
     CUDA_ERR_I2C      = 5  // invalid I2C data or no acknowledge
 };
 
-#define CUDA_IN_BUF_SIZE    256
+constexpr auto CUDA_IN_BUF_SIZE = 256;
 
 /** PRAM addresses within Cuda's internal memory. */
-#define CUDA_PRAM_START 0x100 // starting address of PRAM
-#define CUDA_PRAM_END   0x1FF // last byte of PRAM
-#define CUDA_ROM_START  0xF00 // starting address of ROM containing Cuda FW
+constexpr auto CUDA_PRAM_START    = 0x100;    // starting address of PRAM
+constexpr auto CUDA_PRAM_END      = 0x1FF;    // last byte of PRAM
+constexpr auto CUDA_ROM_START     = 0xF00;    // starting address of ROM containing Cuda FW
 
 /** Latest Cuda Firmware version. */
-#define CUDA_FW_VERSION_MAJOR   0x0002
-#define CUDA_FW_VERSION_MINOR   0x0029
+constexpr auto CUDA_FW_VERSION_MAJOR = 0x0002;
+constexpr auto CUDA_FW_VERSION_MINOR = 0x0029;
 
 class ViaCuda : public HWComponent, public I2CBus {
 public:
diff --git a/devices/ethernet/mace.h b/devices/ethernet/mace.h
@@ -31,8 +31,8 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <memory>
 
 /** Known MACE chip IDs. */
-#define MACE_ID_REV_B0 0x0940 // Darwin-0.3 source
-#define MACE_ID_REV_A2 0x0941 // Darwin-0.3 source & Curio datasheet
+constexpr auto MACE_ID_REV_B0 = 0x0940;    // Darwin-0.3 source;
+constexpr auto MACE_ID_REV_A2 = 0x0941;    // Darwin-0.3 source & Curio datasheet;
 
 /** MACE registers offsets. */
 // Refer to the Am79C940 datasheet for details
diff --git a/devices/floppy/floppyimg.h b/devices/floppy/floppyimg.h
@@ -27,7 +27,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <cinttypes>
 #include <string>
 
-#define BLOCK_SIZE 512 // size in bytes of a logical block
+constexpr auto BLOCK_SIZE = 512;      // size in bytes of a logical block;
 
 #define MFM_HD_SIZE (BLOCK_SIZE*2880) // maximal size of a high-density floppy
 
@@ -50,13 +50,33 @@ class FloppyImgConverter {
     virtual int get_raw_disk_data(char* buf) = 0;
     virtual int export_data(void) = 0;
 
-    int get_data_size()        { return this->data_size;   };
-    int get_disk_rec_method()  { return this->rec_method;  };
-    int get_number_of_tracks() { return this->num_tracks;  };
-    int get_number_of_sides()  { return this->num_sides;   };
-    int get_sectors_per_side() { return this->num_sectors; };
-    int get_rec_density()      { return this->density;     };
-    uint8_t get_format_byte()  { return this->format_byte; };
+    int get_data_size() const {
+        return this->data_size;
+    };
+
+    int get_disk_rec_method() const {
+        return this->rec_method;
+    };
+
+    int get_number_of_tracks() const {
+        return this->num_tracks;
+    };
+
+    int get_number_of_sides() const {
+        return this->num_sides;
+    };
+
+    int get_sectors_per_side() const {
+        return this->num_sectors;
+    };
+
+    int get_rec_density() const {
+        return this->density;
+    };
+
+    uint8_t get_format_byte() const {
+        return this->format_byte;
+    };
 
 protected:
     std::string img_path;
diff --git a/devices/floppy/swim3.cpp b/devices/floppy/swim3.cpp
@@ -152,7 +152,7 @@ uint8_t Swim3Ctrl::read(uint8_t reg_offset)
 
 void Swim3Ctrl::write(uint8_t reg_offset, uint8_t value)
 {
-    uint8_t status_addr;
+    uint8_t status_addr = 0;
 
     switch(reg_offset) {
     case Swim3Reg::Timer:
diff --git a/devices/ioctrl/amic.h b/devices/ioctrl/amic.h
@@ -31,6 +31,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <devices/video/displayid.h>
 #include <devices/video/pdmonboard.h>
 
+#include <atomic>
 #include <cinttypes>
 #include <memory>
 
diff --git a/devices/memctrl/aspen.h b/devices/memctrl/aspen.h
@@ -46,7 +46,7 @@ enum {
     GPIO_OUT    = 14, // 0x38
 };
 
-#define ASPEN_REV_1 0x01000000
+constexpr auto ASPEN_REV_1 = 0x01000000;
 
 /** Aspen RAM bank size bits. */
 enum {
diff --git a/devices/memctrl/hammerhead.h b/devices/memctrl/hammerhead.h
@@ -38,10 +38,10 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <memory>
 
 namespace Hammerhead {
-    #define RISC_MACHINE  0x3
-    #define MACH_TYPE_TNT 0x1
-    #define EXTENDED_ID   0x1 // examine some other registers to get full ID
-    #define HH_CPU_ID_TNT ((RISC_MACHINE << 4) | (EXTENDED_ID << 3) | MACH_TYPE_TNT)
+    constexpr auto RISC_MACHINE  = 0x3;
+    constexpr auto MACH_TYPE_TNT = 0x1;
+    constexpr auto EXTENDED_ID   = 0x1;    // examine some other registers to get full ID;
+    constexpr auto HH_CPU_ID_TNT = ((RISC_MACHINE << 4) | (EXTENDED_ID << 3) | MACH_TYPE_TNT);
 
     // constants for the MBID field of the MOTHERBOARD_ID register
     enum {
diff --git a/devices/memctrl/hmc.h b/devices/memctrl/hmc.h
@@ -75,7 +75,7 @@ class HMC : public MemCtrlBase, public MMIODevice {
 
     int install_ram(uint32_t mb_bank_size, uint32_t bank_a_size, uint32_t bank_b_size);
 
-    uint64_t get_control_reg(void) {
+    uint64_t get_control_reg(void) const {
         return this->ctrl_reg;
     };
 
diff --git a/devices/sound/burgundy.h b/devices/sound/burgundy.h
@@ -36,7 +36,7 @@ enum {
 };
 
 /** Number of internal registers implemented in Burgundy. */
-#define BURGUNDY_NUM_REGS   123
+constexpr auto BURGUNDY_NUM_REGS = 123;
 
 class BurgundyCodec : public MacioSndCodec {
 public:
diff --git a/devices/storage/cdromdrive.h b/devices/storage/cdromdrive.h
@@ -44,9 +44,9 @@ typedef struct {
     uint32_t    start_lba;
 } TrackDescriptor;
 
-#define CDROM_MAX_TRACKS    100
-#define LEAD_OUT_TRK_NUM    0xAA
-#define CDR_STD_DATA_SIZE   2048
+constexpr auto CDROM_MAX_TRACKS = 100;
+constexpr auto LEAD_OUT_TRK_NUM = 0xAA;
+constexpr auto CDR_STD_DATA_SIZE = 2048;
 
 class CdromDrive : public BlockStorageDevice {
 public:
diff --git a/devices/video/appleramdac.h b/devices/video/appleramdac.h
diff --git a/devices/video/rgb514defs.h b/devices/video/rgb514defs.h
diff --git a/devices/video/taos.h b/devices/video/taos.h
