[cadcdev-svn-commits] [SCM] branch master updated. v2.0.0-622-g3e0386f

[ljsebald <ljs...@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  3e0386f19af6af6850f0ddabd588ce97ee776dd3 (commit)
       via  cd3e84a19667a17495295ddfdf76fd29866babe2 (commit)
      from  48bbf14b2331e1ffe7ffad0b08ca6b5248cdbac4 (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 3e0386f19af6af6850f0ddabd588ce97ee776dd3
Merge: 48bbf14 cd3e84a
Author: Lawrence Sebald <ljs...@us...>
Date:   Mon Jan 16 16:23:34 2023 -0500

    Merge pull request #87 from darcagn/master
    
    Add change allowing mm_sbrk to allocate memory beyond 0x8d000000 on 32MB systems.

commit cd3e84a19667a17495295ddfdf76fd29866babe2
Author: darc <da...@pr...>
Date:   Sun Jan 15 23:21:54 2023 -0600

    Add change allowing mm_sbrk to allocate memory beyond 0x8d000000 on 32MB systems

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

Summary of changes:
 kernel/arch/dreamcast/kernel/mm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/arch/dreamcast/kernel/mm.c b/kernel/arch/dreamcast/kernel/mm.c
index c07ad90..296c181 100644
--- a/kernel/arch/dreamcast/kernel/mm.c
+++ b/kernel/arch/dreamcast/kernel/mm.c
@@ -46,7 +46,7 @@ void* mm_sbrk(unsigned long increment) {
 
     sbrk_base = (void *)(increment + (unsigned long)sbrk_base);
 
-    if(((uint32)sbrk_base) >= (0x8d000000 - 65536)) {
+    if(((uint32)sbrk_base) >= (_arch_mem_top - 65536)) {
         dbglog(DBG_DEAD, "Requested sbrk_base %p, was %p, diff %lu\n",
                sbrk_base, base, increment);
         arch_panic("out of memory; about to run over kernel stack");


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