variables.h cleaning: migrate libultra variables (#2503)

* variables.h cleaning: migrate libultra variables

* another increment_block_number

* fix bss

10 files changed, 111 insertions, 53 deletions

diff --git a/include/ultra64.h b/include/ultra64.h
index cccab388b..4a8696a84 100644
--- a/include/ultra64.h
+++ b/include/ultra64.h
@@ -24,12 +24,19 @@
 #include "ultra64/sptask.h"
 #include "ultra64/gu.h"
 #include "ultra64/vi.h"
+#include "ultra64/viint.h"
 #include "ultra64/pi.h"
 #include "ultra64/controller.h"
 #include "ultra64/mbi.h"
 #include "ultra64/pfs.h"
 #include "ultra64/motor.h"
+#include "ultra64/os_pi.h"
+#include "ultra64/os_system.h"
+#include "ultra64/os_vi.h"
+#include "ultra64/osint.h"
+#include "ultra64/piint.h"
 #include "ultra64/R4300.h"
+#include "ultra64/siint.h"
 #include "ultra64/ucode.h"
 #include "ultra64/version.h"
 
diff --git a/include/ultra64/controller.h b/include/ultra64/controller.h
index 1b6d0cf32..e233f0048 100644
--- a/include/ultra64/controller.h
+++ b/include/ultra64/controller.h
@@ -182,4 +182,9 @@ typedef struct __OSContReadFormat {
     /* 0x07 */ s8 joyY;
 } __OSContReadFormat; // size = 0x8
 
+extern u8 __osContLastCmd;
+extern OSPifRam __osContPifRam;
+extern OSPifRam __osPfsPifRam;
+extern u8 __osMaxControllers;
+
 #endif
diff --git a/include/ultra64/os_pi.h b/include/ultra64/os_pi.h
new file mode 100644
index 000000000..5a13f05fd
--- /dev/null
+++ b/include/ultra64/os_pi.h
@@ -0,0 +1,8 @@
+#ifndef ULTRA64_OS_PI_H
+#define ULTRA64_OS_PI_H
+
+#include "pi.h"
+
+extern OSPiHandle* __osPiTable;
+
+#endif
diff --git a/include/ultra64/os_system.h b/include/ultra64/os_system.h
new file mode 100644
index 000000000..19558c310
--- /dev/null
+++ b/include/ultra64/os_system.h
@@ -0,0 +1,31 @@
+#ifndef ULTRA64_OS_SYSTEM_H
+#define ULTRA64_OS_SYSTEM_H
+
+#include "exception.h"
+#include "ultratypes.h"
+
+extern s32 osRomType;	/* Bulk or cartridge ROM. 0=cartridge 1=bulk */
+extern void* osRomBase;	/* Rom base address of the game image */
+extern s32 osTvType;	/* 0 = PAL, 1 = NTSC, 2 = MPAL */
+extern s32 osResetType;	/* 0 = cold reset, 1 = NMI */
+extern s32 osCicId;
+extern s32 osVersion;
+extern u32 osMemSize;	/* Memory Size */
+extern s32 osAppNMIBuffer[0x10];
+
+extern OSIntMask __OSGlobalIntMask;
+
+#ifdef BBPLAYER
+extern u32 __osBbIsBb;
+extern u32 __osBbEepromSize;
+extern u32 __osBbPakSize;
+extern u32 __osBbFlashSize;
+extern u32 __osBbEepromAddress;
+extern u32 __osBbPakAddress[4];
+extern u32 __osBbFlashAddress;
+extern u32 __osBbSramSize;
+extern u32 __osBbSramAddress;
+extern u32 __osBbHackFlags;
+#endif
+
+#endif
diff --git a/include/ultra64/os_vi.h b/include/ultra64/os_vi.h
new file mode 100644
index 000000000..3b38b60fe
--- /dev/null
+++ b/include/ultra64/os_vi.h
@@ -0,0 +1,11 @@
+#ifndef ULTRA64_OS_VI_H
+#define ULTRA64_OS_VI_H
+
+#include "vi.h"
+
+extern OSViMode osViModeNtscLan1;
+extern OSViMode osViModePalLan1;
+extern OSViMode osViModeMpalLan1;
+extern OSViMode osViModeFpalLan1;
+
+#endif
diff --git a/include/ultra64/osint.h b/include/ultra64/osint.h
new file mode 100644
index 000000000..ec254d416
--- /dev/null
+++ b/include/ultra64/osint.h
@@ -0,0 +1,22 @@
+#ifndef ULTRA64_OSINT_H
+#define ULTRA64_OSINT_H
+
+#include "time.h"
+#include "thread.h"
+#include "ultratypes.h"
+
+extern __OSThreadTail __osThreadTail;
+
+extern OSThread* __osRunningThread;
+extern OSThread* __osActiveQueue;
+extern OSThread* __osFaultedThread;
+extern OSThread* __osRunQueue;
+
+extern OSTimer* __osTimerList;
+extern u32 __osBaseCounter;
+extern OSTime __osCurrentTime;
+extern u32 __osViIntrCount;
+extern u32 __osTimerCounter;
+extern u32 __osShutdown;
+
+#endif
diff --git a/include/ultra64/piint.h b/include/ultra64/piint.h
new file mode 100644
index 000000000..59b200a6c
--- /dev/null
+++ b/include/ultra64/piint.h
@@ -0,0 +1,11 @@
+#ifndef ULTRA64_PIINT_H
+#define ULTRA64_PIINT_H
+
+#include "ultratypes.h"
+#include "pi.h"
+
+extern OSPiHandle* __osCurrentHandle[];
+extern OSMesgQueue __osPiAccessQueue;
+extern u32 __osPiAccessQueueEnabled;
+
+#endif
diff --git a/include/ultra64/siint.h b/include/ultra64/siint.h
new file mode 100644
index 000000000..3c4a2c55c
--- /dev/null
+++ b/include/ultra64/siint.h
@@ -0,0 +1,8 @@
+#ifndef ULTRA64_SIINT_H
+#define ULTRA64_SIINT_H
+
+#include "pfs.h"
+
+extern __OSInode __osPfsInodeCache;
+
+#endif
diff --git a/include/ultra64/viint.h b/include/ultra64/viint.h
index 2df993640..25a6ceb04 100644
--- a/include/ultra64/viint.h
+++ b/include/ultra64/viint.h
@@ -1,6 +1,9 @@
 #ifndef ULTRA64_VIINT_H
 #define ULTRA64_VIINT_H
 
+#include "vi.h"
+#include "ultratypes.h"
+
 #define VI_STATE_MODE_SET           (1 << 0)
 #define VI_STATE_XSCALE_SET         (1 << 1)
 #define VI_STATE_YSCALE_FACTOR_SET  (1 << 2)
@@ -43,4 +46,8 @@
 #define VI_CTRL_PIXEL_ADV_DEFAULT VI_CTRL_PIXEL_ADV(3)
 #endif
 
+extern OSViContext* __osViCurr;
+extern OSViContext* __osViNext;
+extern u32 __additional_scanline;
+
 #endif
diff --git a/include/variables.h b/include/variables.h
index b6f1384fc..aa991f8a4 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -7,48 +7,8 @@
 
 struct MapData;
 
-extern void* osRomBase;
-extern s32 osTvType;
-extern u32 osRomType;
-extern u32 osVersion;
-extern s32 osResetType;
-extern s32 osCicId;
-extern u32 osMemSize;
-extern u8 osAppNMIBuffer[0x40];
-
-extern u32 __osBbIsBb;
-extern u32 __osBbEepromSize;
-extern u32 __osBbPakSize;
-extern u32 __osBbFlashSize;
-extern u32 __osBbEepromAddress;
-extern u32 __osBbPakAddress[4];
-extern u32 __osBbFlashAddress;
-extern u32 __osBbSramSize;
-extern u32 __osBbSramAddress;
-extern u32 __osBbHackFlags;
-
 extern OSPiHandle* gCartHandle;
 
-extern u32 __osPiAccessQueueEnabled;
-extern OSViMode osViModePalLan1;
-extern s32 osViClock;
-extern u32 __osShutdown;
-extern OSHWIntr __OSGlobalIntMask;
-extern __OSThreadTail __osThreadTail;
-extern OSThread* __osRunQueue;
-extern OSThread* __osActiveQueue;
-extern OSThread* __osRunningThread;
-extern OSThread* __osFaultedThread;
-extern OSPiHandle* __osPiTable;
-extern OSPiHandle* __osCurrentHandle[];
-extern OSTimer* __osTimerList;
-extern OSViMode osViModeNtscLan1;
-extern OSViMode osViModeMpalLan1;
-extern OSViContext* __osViCurr;
-extern OSViContext* __osViNext;
-extern OSViMode osViModeFpalLan1;
-extern u32 __additional_scanline;
-
 extern const char gBuildCreator[];
 extern const char gBuildDate[];
 extern const char gBuildMakeOption[];
@@ -56,13 +16,7 @@ extern const char gBuildMakeOption[];
 extern OSMesgQueue gPiMgrCmdQueue;
 extern OSViMode gViConfigMode;
 extern u8 gViConfigModeType;
-extern OSMesgQueue __osPiAccessQueue;
-extern OSPiHandle __Dom1SpeedParam;
-extern OSPiHandle __Dom2SpeedParam;
-extern OSTime __osCurrentTime;
-extern u32 __osBaseCounter;
-extern u32 __osViIntrCount;
-extern u32 __osTimerCounter;
+
 extern s16 gSpoilingItems[3];
 extern s16 gSpoilingItemReverts[3];
 
@@ -155,10 +109,4 @@ extern ActiveSequence gActiveSeqs[4];
 extern AudioContext gAudioCtx;
 extern AudioCustomUpdateFunction gAudioCustomUpdateFunction;
 
-extern OSPifRam __osContPifRam;
-extern u8 __osContLastCmd;
-extern u8 __osMaxControllers;
-extern __OSInode __osPfsInodeCache;
-extern OSPifRam __osPfsPifRam;
-
 #endif