[cadcdev-svn-commits] [SCM] branch master updated. v2.0.0-1432-g395d99a9

[darcagn <da...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "A pseudo Operating System for the Dreamcast.".

The branch, master has been updated
       via  395d99a9421aed367d7d277065080301c1a1d54d (commit)
      from  f92103258b6d0943bc657de1199eb9a5d8b4087d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 395d99a9421aed367d7d277065080301c1a1d54d
Author: Falco Girgis <gyr...@gm...>
Date:   Sat Jun 8 20:51:49 2024 -0500

    Fixed a MASSIVE screw-up with enabling OCRAM. (#620)
    
    - OCRAM was being enabled by default now which was halving the size of
      the O-cache.
    - The init flag that was previously reserved for OCRAM was changed,
      moving OCRAM over by a mile and replacing it with INIT_VMU.
    - Damn startup.s was hardcoding the precise bit position of INIT_OCRAM
      and wasn't actually looking at the #define from the C-side, making the
    change unsafe... and as a result... RIP.

-----------------------------------------------------------------------

Summary of changes:
 kernel/arch/dreamcast/kernel/startup.s | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/kernel/arch/dreamcast/kernel/startup.s b/kernel/arch/dreamcast/kernel/startup.s
index bff92c50..0c7b3fa4 100644
--- a/kernel/arch/dreamcast/kernel/startup.s
+++ b/kernel/arch/dreamcast/kernel/startup.s
@@ -45,9 +45,8 @@ setup_cache:
 	! Now that we are in P2, it's safe to enable the cache
 	! Check to see if we should enable OCRAM.
 	mov.l	kos_init_flags_addr, r0
-	add	#2, r0
-	mov.w	@r0, r0
-	tst	#1, r0
+	mov.b 	@(3,r0),r0
+	tst 	#0x10,r0
 	bf	.L_setup_cache_L0
 	mov.w	ccr_data,r1
 	bra	.L_setup_cache_L1


hooks/post-receive
-- 
A pseudo Operating System for the Dreamcast.