fix broken macro, create flags structure

noahw2021 · Dec 27, 2023 · 95cf0cf · 95cf0cf
1 parent 7ee8ef7
commit 95cf0cf
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/...proj/project.xcworkspace/xcuserdata/noahwooten.xcuserdatad/UserInterfaceState.xcuserstate b/...proj/project.xcworkspace/xcuserdata/noahwooten.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/plasm2_emu/basetypes.h b/plasm2_emu/basetypes.h
@@ -11,7 +11,7 @@ typedef unsigned long WORD32;
 typedef unsigned short WORD16;
 typedef unsigned char BYTE, _bool;
 
-#define InRange(x, min, max) (x > min && x < max)
+#define InRange(x, min, max) (x >= min && x <= max)
 
 #define TRUE 1
 #define FALSE 0
diff --git a/plasm2_emu/cpu/ops/cops_memory.c b/plasm2_emu/cpu/ops/cops_memory.c
@@ -94,10 +94,18 @@ void POP(void) {
 void PSR(void) {
 	for (int c = 0; c < 16; c++)
 		MmuPush(ECtx->GPRs[c]);
+    if (ECtx->Security.SecurityLevel <= 1) {
+        for (int c = 0; c < 16; c++)
+            MmuPush(ECtx->SystemRs[c]);
+    }
 	return;
 }
 
 void POR(void) {
+    if (ECtx->Security.SecurityLevel <= 1) {
+        for (int c = 0; c < 16; c++)
+            ECtx->SystemRs[c] = MmuPop();
+    }
 	for (int c = 0; c < 16; c++)
 		ECtx->GPRs[c] = MmuPop();
 	return;

diff --git a/plasm2_emu/devices/devices.h b/plasm2_emu/devices/devices.h
@@ -39,6 +39,16 @@ WORD64  DevicesiDevCount(void);
 #define DEVSTATUS_RSN_INVCMD 0x00010000
 #define DEVSTATUS_RSN_CLEAR  0x00FF0000
 
+typedef union _CPU_DEVICE_FLAGS {
+    WORD32 FlagsRaw;
+    struct {
+        WORD32 Active : 1;
+        WORD32 On : 1;
+        WORD32 Sleep : 1;
+        WORD32 Hotswappable : 1;
+    };
+}CPU_DEVICE_FLAGS, *PCPU_DEVICE_FLAGS;
+
 typedef struct _DEVICES_CTX {
 	WORD64 DeviceCount;
 	struct {
@@ -49,15 +59,7 @@ typedef struct _DEVICES_CTX {
 		WORD64 DeviceModel;
 		WORD64 DeviceSerial;
 		WORD64(*Callbacks[7])(WORD32 DeviceId, WORD64 Argument);
-		union {
-			WORD32 FlagsRaw;
-			struct {
-				BYTE Active : 1;
-				BYTE On : 1;
-				BYTE Sleep : 1;
-				BYTE Hotswappable : 1;
-			};
-		}Flags;
+        CPU_DEVICE_FLAGS Flags;
 	}*Devices;
 }DEVICES_CTX, *PDEVICES_CTX;
 extern PDEVICES_CTX DevicesCtx;