Skip to content

Commit aa2d280

Browse files
committed
Define remaining MSR bits
Related cleanup
1 parent 6fe9ee8 commit aa2d280

3 files changed

Lines changed: 18 additions & 11 deletions

File tree

include/ogc/machine/asm.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,14 +335,21 @@
335335
#define ECID2 926
336336
#define ECID3 927
337337

338+
#define MSR_LE 0x00000001
338339
#define MSR_RI 0x00000002
340+
#define MSR_PM 0x00000004
339341
#define MSR_DR 0x00000010
340342
#define MSR_IR 0x00000020
341343
#define MSR_IP 0x00000040
344+
#define MSR_FE1 0x00000100
345+
#define MSR_BE 0x00000200
342346
#define MSR_SE 0x00000400
347+
#define MSR_FE0 0x00000800
343348
#define MSR_ME 0x00001000
344349
#define MSR_FP 0x00002000
350+
#define MSR_PR 0x00004000
345351
#define MSR_EE 0x00008000
352+
#define MSR_ILE 0x00010000
346353
#define MSR_POW 0x00040000
347354

348355
#define PPC_ALIGNMENT 8

libogc/cache_asm.S

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
cache_asm.S -- Cache interface
44
5-
Copyright (C) 2004 - 2025
5+
Copyright (C) 2004 - 2026
66
Michael Wiedenbauer (shagkur)
77
Dave Murphy (WinterMute)
88
Extrems' Corner.org
@@ -265,7 +265,7 @@ __L2Init:
265265
stw r31,12(sp)
266266
mfmsr r31
267267
sync
268-
li r3,48
268+
li r3,MSR_IR|MSR_DR
269269
mtmsr r3
270270
sync
271271
bl L2Disable
@@ -346,7 +346,7 @@ L2SetWriteThrough:
346346
.globl __LCEnable
347347
__LCEnable:
348348
mfmsr r5
349-
ori r5,r5,0x1000
349+
ori r5,r5,MSR_ME
350350
mtmsr r5
351351
lis r3,0x8000
352352
li r4,1024

libogc/system_asm.S

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ __configBATS:
9696
#endif
9797

9898
mfmsr r3
99-
ori r3,r3,MSR_DR|MSR_IR
99+
ori r3,r3,MSR_IR|MSR_DR
100100
mtsrr1 r3
101101
mflr r3
102102
oris r3,r3,0x8000
@@ -122,7 +122,7 @@ __configMEM1_16MB:
122122
isync
123123

124124
mfmsr r3
125-
ori r3,r3,MSR_DR|MSR_IR
125+
ori r3,r3,MSR_IR|MSR_DR
126126
mtsrr1 r3
127127
mflr r3
128128
mtsrr0 r3
@@ -161,7 +161,7 @@ __configMEM1_24MB:
161161
isync
162162

163163
mfmsr r3
164-
ori r3,r3,MSR_DR|MSR_IR
164+
ori r3,r3,MSR_IR|MSR_DR
165165
mtsrr1 r3
166166
mflr r3
167167
mtsrr0 r3
@@ -186,7 +186,7 @@ __configMEM1_32MB:
186186
isync
187187

188188
mfmsr r3
189-
ori r3,r3,MSR_DR|MSR_IR
189+
ori r3,r3,MSR_IR|MSR_DR
190190
mtsrr1 r3
191191
mflr r3
192192
mtsrr0 r3
@@ -225,7 +225,7 @@ __configMEM1_48MB:
225225
isync
226226

227227
mfmsr r3
228-
ori r3,r3,MSR_DR|MSR_IR
228+
ori r3,r3,MSR_IR|MSR_DR
229229
mtsrr1 r3
230230
mflr r3
231231
mtsrr0 r3
@@ -250,7 +250,7 @@ __configMEM1_64MB:
250250
isync
251251

252252
mfmsr r3
253-
ori r3,r3,MSR_DR|MSR_IR
253+
ori r3,r3,MSR_IR|MSR_DR
254254
mtsrr1 r3
255255
mflr r3
256256
mtsrr0 r3
@@ -286,7 +286,7 @@ __configMEM2_64MB:
286286
isync
287287

288288
mfmsr r3
289-
ori r3,r3,MSR_DR|MSR_IR
289+
ori r3,r3,MSR_IR|MSR_DR
290290
mtsrr1 r3
291291
mflr r3
292292
mtsrr0 r3
@@ -321,7 +321,7 @@ __configMEM2_128MB:
321321
isync
322322

323323
mfmsr r3
324-
ori r3,r3,MSR_DR|MSR_IR
324+
ori r3,r3,MSR_IR|MSR_DR
325325
mtsrr1 r3
326326
mflr r3
327327
mtsrr0 r3

0 commit comments

Comments
 (0)