Cleaning up some warnings and errors

Author: mysterymath

mos-platform/pce-common/libpce/include/pce/vdc.h

@@ -280,7 +280,7 @@ void pce_sgx_vdc_set(uint8_t id);
 /**
  * @brief SuperGrafx: Get the current VDC's index port location.
  */
-volatile uint8_t *pce_sgx_vdc_get_index(void);
+volatile uint16_t *pce_sgx_vdc_get_index(void);
 
 /**
  * @brief SuperGrafx: Get the current VDC's data port location.

mos-platform/pce-common/libpce/src/vce.c

@@ -22,12 +22,12 @@ void pce_vce_set_color(uint16_t index, uint16_t value) {
 
 void pce_vce_copy_palette(uint8_t index, const void *source, uint8_t count) {
   *IO_VCE_COLOR_INDEX = ((uint16_t)index) << 4;
-  pce_memop(IO_VCE_COLOR_DATA, source, ((uint16_t)count) << 5,
+  pce_memop((void *)IO_VCE_COLOR_DATA, source, ((uint16_t)count) << 5,
             PCE_MEMOP_INCR_ALT);
 }
 
 void pce_vce_copy_palette_to_ram(void *dest, uint8_t index, uint8_t count) {
   *IO_VCE_COLOR_INDEX = ((uint16_t)index) << 4;
-  pce_memop(dest, IO_VCE_COLOR_DATA, ((uint16_t)count) << 5,
+  pce_memop(dest, (const void *)IO_VCE_COLOR_DATA, ((uint16_t)count) << 5,
             PCE_MEMOP_ALT_INCR);
 }

mos-platform/pce-common/libpce/src/vdc.c

@@ -66,14 +66,14 @@ void pce_vdc_copy_to_vram(uint16_t dest, const void *source, uint16_t length) {
   PCE_VDC_INDEX_CONST(VDC_REG_VRAM_WRITE_ADDR);
   *IO_VDC_DATA = dest;
   PCE_VDC_INDEX_CONST(VDC_REG_VRAM_DATA);
-  pce_memop(IO_VDC_DATA, source, length, PCE_MEMOP_INCR_ALT);
+  pce_memop((void *)IO_VDC_DATA, source, length, PCE_MEMOP_INCR_ALT);
 }
 
 void pce_vdc_copy_from_vram(void *dest, uint16_t source, uint16_t length) {
   PCE_VDC_INDEX_CONST(VDC_REG_VRAM_READ_ADDR);
   *IO_VDC_DATA = source;
   PCE_VDC_INDEX_CONST(VDC_REG_VRAM_DATA);
-  pce_memop(dest, IO_VDC_DATA, length, PCE_MEMOP_ALT_INCR);
+  pce_memop(dest, (const void *)IO_VDC_DATA, length, PCE_MEMOP_ALT_INCR);
 }
 
 void pce_vdc_dma_start(uint8_t mode, uint16_t source, uint16_t dest,
@@ -222,7 +222,9 @@ void pce_sgx_vdc_set(uint8_t id) {
   *IO_VPC_PORT = id;
 }
 
-volatile uint8_t *pce_sgx_vdc_get_index() { return IO_VDC_INDEX; }
+volatile uint8_t *pce_sgx_vdc_get_index() {
+  return (volatile uint8_t *)IO_VDC_INDEX;
+}
 
 volatile uint16_t *pce_sgx_vdc_get_data() { return IO_VDC_DATA; }
 
@@ -284,4 +286,4 @@ void pce_vdc_irq_vblank_enable(void) { pce_vdc_enable(VDC_CONTROL_IRQ_VBLANK); }
 
 void pce_vdc_irq_vblank_disable(void) {
   pce_vdc_disable(VDC_CONTROL_IRQ_VBLANK);
-}
+}

utils/sim/mos-sim.c

@@ -1,3 +1,4 @@
+#include <inttypes.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -73,12 +74,12 @@ int8_t read6502(uint16_t address) {
 
 void finish(void) {
   if (shouldPrintCycles)
-    fprintf(stderr, "%llu cycles\n", clockticks6502);
+    fprintf(stderr, PRIu64 " cycles\n", clockticks6502);
 
   if (shouldProfile)
     for (int addr = 0; addr < 65536; ++addr)
       if (clockTicksAtAddress[addr])
-        fprintf(stderr, "%04x %llu\n", addr, clockTicksAtAddress[addr]);
+        fprintf(stderr, "%04x " PRIu64 "\n", addr, clockTicksAtAddress[addr]);
 }
 
 void write6502(uint16_t address, uint8_t value) {