duskos

commit 8ae6e0d4cb21ca57d5aef986e802f22d07102457
parent 0e1a10e67eb2e7a1d8f9f6feebf499ed07b4e60e
Author: Virgil Dupras <hsoft@hardcoded.net>
Date:   Tue, 11 Oct 2022 09:28:30 -0400

cc: fix broken CType :export

This makes testcvm.fs work!

Diffstat:
M
fs/app/cos/test.fs
 | 
2
+-
M
fs/cc/type.fs
 | 
2
+-
M
posix/dis.c
 | 
7
+++++--

3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/fs/app/cos/test.fs b/fs/app/cos/test.fs
@@ -5,10 +5,10 @@ f<< /app/cos/cvm.fs
 COS_init
 vm structbind COSVM vm
 vm mem f" /app/cos/dummy.bin" File :readall
+." vm mem addr " vm mem .x nl>
 vm running _assert
 \ The "dummy.bin" file is a test handcrafted binary with the equivalent of:
 \ bye
 
-\ This is not working at the moment
 1 COS_steps not _assert
 vm running not _assert
diff --git a/fs/cc/type.fs b/fs/cc/type.fs
@@ -124,7 +124,7 @@ struct[ CType
     dup name NEXTWORD ! struct[ llnext begin ( ctype )
       ?dup while
       dup name NEXTWORD ! dup nbelem if ( ctype )
-        SZ &+ dup type _typesize over nbelem * sallot
+        dup Struct size &+ dup type _typesize over nbelem * sallot
       else ( ctype )
         dup type _typesize case
           1 of = sfieldb endof
diff --git a/posix/dis.c b/posix/dis.c
@@ -143,7 +143,7 @@ struct call {
     int arg;
 };
 
-#define CALLCNT 9
+#define CALLCNT 12
 struct call calls[CALLCNT] = {
     {0x9e, "(br)", ARGINT},
     {0xae, "(?br)", ARGINT},
@@ -153,7 +153,10 @@ struct call calls[CALLCNT] = {
     {0x1d7, "8b @", ARGNONE},
     {0x1e9, "!", ARGNONE},
     {0x1f9, "8b !", ARGNONE},
-    {0x36e, "+", ARGNONE}
+    {0x355, "1+", ARGNONE},
+    {0x36e, "+", ARGNONE},
+    {0x3a3, "and", ARGNONE},
+    {0x3ec, "not", ARGNONE}
 };
 
 static int offset = 0;