Match JUTException

include/JSystem/JKernel/JKRArchive.h

@@ -128,8 +128,9 @@ public:
     };
 
     JKRArchive(s32, EMountMode);
-
-    virtual ~JKRArchive();                                                                                                                  // _08
+private:
+    ~JKRArchive();
+public:                                                                                                                 // _08
     virtual bool becomeCurrent(const char*);                                                                                                // _10
     virtual void* getResource(const char* path);                                                                                            // _14
     virtual void* getResource(u32 type, const char* name);                                                                                  // _18
@@ -161,12 +162,11 @@ public:
     static JKRArchive* mount(void*, JKRHeap*, EMountDirection);
     static JKRArchive* mount(s32, EMountMode, JKRHeap*, EMountDirection);
     static void* getGlbResource(u32 type, const char* name, JKRArchive* archive);
-
-    // Unused/inlined:
-    JKRArchive();
-    JKRArchive(const char* p1, EMountMode mountMode);
     static JKRArchive* check_mount_already(s32);
     static JKRArchive* check_mount_already(s32, JKRHeap*);
+
+    JKRArchive();
+    JKRArchive(const char* p1, EMountMode mountMode);
     SDIDirEntry* findResType(u32) const;
     SDIFileEntry* findTypeResource(u32, u32) const;
 

include/JSystem/JUtility/JUTException.h

@@ -17,11 +17,9 @@ enum ExPrintFlags
 {
     EXPRINTFLAG_GPR = 0x1,
     EXPRINTFLAG_GPRMap = 0x2,
-    EXPRINTFLAG_SRR0Map = 0x4,
-    EXPRINTFLAG_Float = 0x8,
-    EXPRINTFLAG_Stack = 0x10,
-
-    EXPRINTFLAG_All = 0x1F,
+    EXPRINTFLAG_Float = 0x4,
+    EXPRINTFLAG_Stack = 0x8,
+    EXPRINTFLAG_All = 0xF,
 };
 
 /**
@@ -35,7 +33,7 @@ struct JUTException : public JKRThread
         INFOPAGE_Float = 2,
         INFOPAGE_Stack = 3,
         INFOPAGE_GPRMap = 4,
-        INFOPAGE_SRR0Map = 5,
+        
     };
 
     // size: 0x14
@@ -102,7 +100,7 @@ struct JUTException : public JKRThread
     void showGPR(OSContext *);
     void showSRR0Map(OSContext *);
     bool isEnablePad() const;
-    u32 getFpscr();
+    static u32 getFpscr();
     void setFpscr(u32);
     void enableFpuException();
     void disableFpuException();
@@ -129,7 +127,7 @@ struct JUTException : public JKRThread
     static JUTErrorHandler sPostUserCallback;
     static u32 msr;
     static u32 fpscr;
-    static const char *sCpuExpName[32];
+    static const char *sCpuExpName[16];
     static JSUList<JUTExMapFile> sMapFileList;
 
     // _00     = VTBL
@@ -143,7 +141,6 @@ struct JUTException : public JKRThread
     u32 mTraceSuppress;            // _94
     u32 _98;                       // _98
     u32 mPrintFlags;               // _9C, see ExPrintFlags enum
-    u32 mStackPointer;                 // _A0
 };
 
 #endif

include/JSystem/JUtility/JUTGamePad.h

@@ -93,7 +93,7 @@ public:
     void clearForReset();
     static void init();
     void initList();
-    void read();
+    static void read();
     static bool recalibrate(u32);
     void setButtonRepeat(u32, u32, u32);
     void update();