Changeset 3477 for trunk/src/kash/memalloc.c

Timestamp:

Sep 17, 2020, 11:52:16 PM (5 years ago)

Author:

bird

Message:

kash: Use kHlpAssert instead of assert.h (debugger stops on the assertion rather than at exit process code).

File:

• trunk/src/kash/memalloc.c (modified) (14 diffs)

trunk/src/kash/memalloc.c

@@ -43 +43 @@
 #include <stdlib.h>
 #include <stddef.h>
-#include <assert.h>
 
 #include "shell.h"
@@ -332 +331 @@
         size_t nbytes = (size_t)(end - pstart);
 
-        assert((uintptr_t)end >= (uintptr_t)pstart);
-        /*assert(end[-1] == '\0'); - not if it's followed by ungrabstrackstr(), sigh. */
-        assert(SHELL_ALIGN((uintptr_t)pstart) == (uintptr_t)pstart);
-        assert(stackblocksize(psh) - psh->sstrnleft >= nbytes);
+        kHlpAssert((uintptr_t)end >= (uintptr_t)pstart);
+        /*kHlpAssert(end[-1] == '\0'); - not if it's followed by ungrabstrackstr(), sigh. */
+        kHlpAssert(SHELL_ALIGN((uintptr_t)pstart) == (uintptr_t)pstart);
+        kHlpAssert(stackblocksize(psh) - psh->sstrnleft >= nbytes);
 
         nbytes = SHELL_ALIGN(nbytes);
         psh->stacknxt += nbytes;
         psh->stacknleft -= (int)nbytes;
-        assert(psh->stacknleft >= 0);
+        kHlpAssert(psh->stacknleft >= 0);
 
         return pstart;
@@ -348 +347 @@
 ungrabstackstr(shinstance *psh, char *s, char *p)
 {
-        assert((size_t)(psh->stacknxt - p) <= SHELL_SIZE);
-        assert((uintptr_t)s >= (uintptr_t)&psh->stackp->space[0]);
-        assert((uintptr_t)p >= (uintptr_t)s);
+        kHlpAssert((size_t)(psh->stacknxt - p) <= SHELL_SIZE);
+        kHlpAssert((uintptr_t)s >= (uintptr_t)&psh->stackp->space[0]);
+        kHlpAssert((uintptr_t)p >= (uintptr_t)s);
 
         psh->stacknleft += (int)(psh->stacknxt - s);
@@ -374 +373 @@
                         while ((top = pst->top) != &pst->first) {
                                 pst->top = top->prev;
-                                assert(pst->top);
+                                kHlpAssert(pst->top);
                                 top->prev = NULL;
                                 sh_free(psh, top);
@@ -393 +392 @@
 void pstackpop(shinstance *psh, unsigned target)
 {
-        assert(target <= psh->pstacksize);
+        kHlpAssert(target <= psh->pstacksize);
         while (target < psh->pstacksize) {
                 unsigned idx = --psh->pstacksize;
@@ -414 +413 @@
                         if (psh->curpstack == psh->pstack[i])
                                 break;
-                assert(i < psh->pstacksize);
+                kHlpAssert(i < psh->pstacksize);
         }
 # endif
@@ -423 +422 @@
 {
         unsigned refs = sh_atomic_inc(&pst->refs);
-        assert(refs > 1);
-        assert(refs < 256 /* bogus, but useful */);
+        kHlpAssert(refs > 1);
+        kHlpAssert(refs < 256 /* bogus, but useful */);
         return refs;
 }
@@ -533 +532 @@
         size_t blocksize;
 
-        assert(pst->avail < nbytes); /* only called when we need more space */
-        assert(tocopy <= pst->avail);
+        kHlpAssert(pst->avail < nbytes); /* only called when we need more space */
+        kHlpAssert(tocopy <= pst->avail);
 
         /* Double the size used thus far and add some fudge and alignment.  Make
@@ -562 +561 @@
                 char const * const copysrc = pst->nextbyte;
                 pstallocnewblock(psh, pst, nbytes);
-                assert(pst->avail >= nbytes);
-                assert(pst->avail >= tocopy);
+                kHlpAssert(pst->avail >= nbytes);
+                kHlpAssert(pst->avail >= tocopy);
                 memcpy(pst->nextbyte, copysrc, tocopy);
         }
@@ -646 +645 @@
         size_t const len = end - pst->nextbyte;
 
-        assert(pst->avail - pst->strleft == len);
+        kHlpAssert(pst->avail - pst->strleft == len);
         TRACE2((psh, "pstmakestrspace: len=%u minbytes=%u (=> %u)\n", len, minbytes, len + minbytes));
 
@@ -657 +656 @@
         size_t const len = end - stackblock(psh);
 
-        assert(stackblocksize(psh) - psh->sstrnleft == len);
+        kHlpAssert(stackblocksize(psh) - psh->sstrnleft == len);
         TRACE2((psh, "pstmakestrspace: len=%u minbytes=%u (=> %u)\n", len, minbytes, len + minbytes));
 
@@ -676 +675 @@
         pst->strleft++;         /* PSTPUTC() already incremented it. */
         end = pstmakestrspace(psh, 1, end);
-        assert(pst->strleft > 0);
+        kHlpAssert(pst->strleft > 0);
         pst->strleft--;
 #else
         psh->sstrnleft++;       /* PSTPUTC() already incremented it. */
         end = pstmakestrspace(psh, 1, end);
-        assert(psh->sstrnleft > 0);
+        kHlpAssert(psh->sstrnleft > 0);
         psh->sstrnleft--;
 #endif
@@ -696 +695 @@
         size_t nbytes = (size_t)(end - pstart);
 
-        assert((uintptr_t)end > (uintptr_t)pstart);
-        assert(end[-1] == '\0');
-        assert(SHELL_ALIGN((uintptr_t)pstart) == (uintptr_t)pstart);
-        assert(pst->avail - pst->strleft >= nbytes);
+        kHlpAssert((uintptr_t)end > (uintptr_t)pstart);
+        kHlpAssert(end[-1] == '\0');
+        kHlpAssert(SHELL_ALIGN((uintptr_t)pstart) == (uintptr_t)pstart);
+        kHlpAssert(pst->avail - pst->strleft >= nbytes);
 
         nbytes = SHELL_ALIGN(nbytes); /** @todo don't align strings, align the other allocations. */
@@ -712 +711 @@
         size_t nbytes = (size_t)(end - pstart);
 
-        assert((uintptr_t)end > (uintptr_t)pstart);
-        assert(end[-1] == '\0');
-        assert(SHELL_ALIGN((uintptr_t)pstart) == (uintptr_t)pstart);
-        assert(stackblocksize(psh) - psh->sstrnleft >= nbytes);
+        kHlpAssert((uintptr_t)end > (uintptr_t)pstart);
+        kHlpAssert(end[-1] == '\0');
+        kHlpAssert(SHELL_ALIGN((uintptr_t)pstart) == (uintptr_t)pstart);
+        kHlpAssert(stackblocksize(psh) - psh->sstrnleft >= nbytes);
 
         nbytes = SHELL_ALIGN(nbytes); /** @todo don't align strings, align the other allocations. */