nac3standalone/demo/check_demo.sh

@@ -21,7 +21,7 @@ echo ">>>>>> Running $demo with the Python interpreter"
 ./interpret_demo.py "$demo" > interpreted.log
 
 echo "...... Trying NAC3's 32-bit code generator output"
-./run_demo.sh -i386 --out run_32.log "${nac3args[@]}" "$demo"
+./run_demo.sh -m32 --out run_32.log "${nac3args[@]}" "$demo"
 diff -Nau interpreted.log run_32.log
 
 echo "...... Trying NAC3's 64-bit code generator output"

nac3standalone/demo/demo.c

@@ -6,6 +6,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#define usize size_t
+
 double dbl_nan(void) {
   return NAN;
 }
@@ -62,14 +64,14 @@ void output_asciiart(int32_t x) {
 
 struct cslice {
     void *data;
-    size_t len;
+    uint32_t len;
 };
 
 void output_int32_list(struct cslice *slice) {
     const int32_t *data = (int32_t *) slice->data;
 
     putchar('[');
-    for (size_t i = 0; i < slice->len; ++i) {
+    for (uint32_t i = 0; i < slice->len; ++i) {
         if (i == slice->len - 1) {
             printf("%d", data[i]);
         } else {
@@ -83,7 +85,7 @@ void output_int32_list(struct cslice *slice) {
 void output_str(struct cslice *slice) {
     const char *data = (const char *) slice->data;
 
-    for (size_t i = 0; i < slice->len; ++i) {
+    for (uint32_t i = 0; i < slice->len; ++i) {
         putchar(data[i]);
     }
 }

nac3standalone/demo/run_demo.sh

@@ -11,7 +11,7 @@ declare -a nac3args
 while [ $# -ge 1 ]; do
   case "$1" in
     --help)
-      echo "Usage: run_demo.sh [--help] [--out OUTFILE] [--debug] [-i386] -- [NAC3ARGS...]"
+      echo "Usage: run_demo.sh [--help] [--out OUTFILE] [--debug] [-m32] -- [NAC3ARGS...]"
       exit
       ;;
     --out)
@@ -21,8 +21,8 @@ while [ $# -ge 1 ]; do
     --debug)
       debug=1
       ;;
-    -i386)
-      i386=1
+    -m32)
+      m32=1
       ;;
     --)
       shift
@@ -51,7 +51,7 @@ fi
 
 rm -f ./*.o ./*.bc demo
 
-if [ -z "$i386" ]; then
+if [ -z "$m32" ]; then
   $nac3standalone "${nac3args[@]}"
 
   clang -c -std=gnu11 -Wall -Wextra -O3 -o demo.o demo.c