about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik Agaram <vc@akkartik.com>2020-06-29 19:14:19 -0700
committerKartik Agaram <vc@akkartik.com>2020-06-29 19:14:19 -0700
commit222548962c9ed85c9d5057757287d0b0b069af02 (patch)
tree25f2d36f9fd1b175523e603685d2173c3e38171e
parent12e2b93a4bec024f3000adafb013d9490c821ae8 (diff)
downloadmu-222548962c9ed85c9d5057757287d0b0b069af02.tar.gz
6599
-rw-r--r--103screen.subx4
-rw-r--r--apps/arith.mu8
-rw-r--r--apps/browse.mu2
-rw-r--r--apps/parse-int.mu2
-rw-r--r--apps/print-file.mu2
-rw-r--r--apps/tui.mu14
-rw-r--r--prototypes/browse/10.mu2
-rw-r--r--prototypes/browse/11.mu2
-rw-r--r--prototypes/browse/12.mu2
-rw-r--r--prototypes/browse/13.mu2
-rw-r--r--prototypes/browse/14.mu2
-rw-r--r--prototypes/browse/15-headers-broken.mu2
-rw-r--r--prototypes/browse/4-render-page.mu2
-rw-r--r--prototypes/browse/5.mu2
-rw-r--r--prototypes/browse/6.mu2
-rw-r--r--prototypes/browse/7.mu2
-rw-r--r--prototypes/browse/8-multiple-pages.mu2
-rw-r--r--prototypes/browse/9-bold.mu2
18 files changed, 28 insertions, 28 deletions
diff --git a/103screen.subx b/103screen.subx
index 0b9371a6..0fe5a2ee 100644
--- a/103screen.subx
+++ b/103screen.subx
@@ -119,13 +119,13 @@ $move-cursor:end:
     5d/pop-to-ebp
     c3/return
 
-print-string:  # s: (addr array byte)
+print-string-to-screen:  # s: (addr array byte)
     # . prologue
     55/push-ebp
     89/<- %ebp 4/r32/esp
     #
     (write 2 *(ebp+8))
-$print-string:end:
+$print-string-to-screen:end:
     # . epilogue
     89/<- %esp 5/r32/ebp
     5d/pop-to-ebp
diff --git a/apps/arith.mu b/apps/arith.mu
index 39e304b0..4f33d7be 100644
--- a/apps/arith.mu
+++ b/apps/arith.mu
@@ -35,11 +35,11 @@
 fn main -> exit-status/ebx: int {
   var look/esi: byte <- copy 0  # lookahead
   var n/eax: int <- copy 0  # result of each expression
-  print-string "press ctrl-c or ctrl-d to exit\n"
+  print-string-to-screen "press ctrl-c or ctrl-d to exit\n"
   # read-eval-print loop
   {
     # print prompt
-    print-string "> "
+    print-string-to-screen "> "
     # read and eval
     n, look <- simplify  # we explicitly thread 'look' everywhere
     # if (look == 0) break
@@ -47,7 +47,7 @@ fn main -> exit-status/ebx: int {
     break-if-=
     # print
     print-int32-to-screen n
-    print-string "\n"
+    print-string-to-screen "\n"
     #
     loop
   }
@@ -249,7 +249,7 @@ fn get-char -> look/esi: byte {
   compare look, 0
   {
     break-if-!=
-    print-string "^D\n"
+    print-string-to-screen "^D\n"
     syscall_exit
   }
 }
diff --git a/apps/browse.mu b/apps/browse.mu
index 4a7ab2c1..0f34e11e 100644
--- a/apps/browse.mu
+++ b/apps/browse.mu
@@ -163,7 +163,7 @@ fn clear toprow: int, leftcol: int, botrow: int, rightcol: int {
     {
       compare col, rightcol
       break-if->=
-      print-string " "
+      print-string-to-screen " "
       col <- increment
       loop
     }
diff --git a/apps/parse-int.mu b/apps/parse-int.mu
index c9c1d945..d8ae87e0 100644
--- a/apps/parse-int.mu
+++ b/apps/parse-int.mu
@@ -14,7 +14,7 @@ $main-body: {
   compare n, 1
   {
     break-if->
-    print-string "usage: parse-int <integer>\n"
+    print-string-to-screen "usage: parse-int <integer>\n"
     exit-status <- copy 1
     break $main-body
   }
diff --git a/apps/print-file.mu b/apps/print-file.mu
index c44e09d1..ec9f9367 100644
--- a/apps/print-file.mu
+++ b/apps/print-file.mu
@@ -14,7 +14,7 @@ $main-body: {
     compare n, 1
     {
       break-if->
-      print-string "usage: cat <filename>\n"
+      print-string-to-screen "usage: cat <filename>\n"
       break $main-body
     }
     {
diff --git a/apps/tui.mu b/apps/tui.mu
index 07d3147e..cde83b2b 100644
--- a/apps/tui.mu
+++ b/apps/tui.mu
@@ -12,22 +12,22 @@ fn main -> exit-status/ebx: int {
   move-cursor 5, 35
   start-color 1, 0x7a
   start-blinking
-  print-string "Hello world!"
+  print-string-to-screen "Hello world!"
   reset-formatting
   move-cursor 6, 35
-  print-string "tty dimensions: "
+  print-string-to-screen "tty dimensions: "
   print-int32-to-screen nrows
-  print-string " rows, "
+  print-string-to-screen " rows, "
   print-int32-to-screen ncols
-  print-string " rows\n"
+  print-string-to-screen " rows\n"
 
-  print-string "press a key to see its code: "
+  print-string-to-screen "press a key to see its code: "
   enable-keyboard-immediate-mode
   var x/eax: byte <- read-key
   enable-keyboard-type-mode
   enable-screen-type-mode
-  print-string "You pressed "
+  print-string-to-screen "You pressed "
   print-int32-to-screen x
-  print-string "\n"
+  print-string-to-screen "\n"
   exit-status <- copy 0
 }
diff --git a/prototypes/browse/10.mu b/prototypes/browse/10.mu
index 88c4d5c9..a07f8aa8 100644
--- a/prototypes/browse/10.mu
+++ b/prototypes/browse/10.mu
@@ -142,7 +142,7 @@ fn clear toprow: int, leftcol: int, botrow: int, rightcol: int {
     {
       compare col, rightcol
       break-if->=
-      print-string " "
+      print-string-to-screen " "
       col <- increment
       loop
     }
diff --git a/prototypes/browse/11.mu b/prototypes/browse/11.mu
index 1fa9e980..86440eb9 100644
--- a/prototypes/browse/11.mu
+++ b/prototypes/browse/11.mu
@@ -138,7 +138,7 @@ fn clear toprow: int, leftcol: int, botrow: int, rightcol: int {
     {
       compare col, rightcol
       break-if->=
-      print-string " "
+      print-string-to-screen " "
       col <- increment
       loop
     }
diff --git a/prototypes/browse/12.mu b/prototypes/browse/12.mu
index 49be7ae8..d3871d40 100644
--- a/prototypes/browse/12.mu
+++ b/prototypes/browse/12.mu
@@ -141,7 +141,7 @@ fn clear toprow: int, leftcol: int, botrow: int, rightcol: int {
     {
       compare col, rightcol
       break-if->=
-      print-string " "
+      print-string-to-screen " "
       col <- increment
       loop
     }
diff --git a/prototypes/browse/13.mu b/prototypes/browse/13.mu
index 895f959b..47b2b398 100644
--- a/prototypes/browse/13.mu
+++ b/prototypes/browse/13.mu
@@ -142,7 +142,7 @@ fn clear toprow: int, leftcol: int, botrow: int, rightcol: int {
     {
       compare col, rightcol
       break-if->=
-      print-string " "
+      print-string-to-screen " "
       col <- increment
       loop
     }
diff --git a/prototypes/browse/14.mu b/prototypes/browse/14.mu
index 6168b69c..4f4229af 100644
--- a/prototypes/browse/14.mu
+++ b/prototypes/browse/14.mu
@@ -140,7 +140,7 @@ fn clear toprow: int, leftcol: int, botrow: int, rightcol: int {
     {
       compare col, rightcol
       break-if->=
-      print-string " "
+      print-string-to-screen " "
       col <- increment
       loop
     }
diff --git a/prototypes/browse/15-headers-broken.mu b/prototypes/browse/15-headers-broken.mu
index 5644f52d..30461744 100644
--- a/prototypes/browse/15-headers-broken.mu
+++ b/prototypes/browse/15-headers-broken.mu
@@ -182,7 +182,7 @@ fn clear toprow: int, leftcol: int, botrow: int, rightcol: int {
     {
       compare col, rightcol
       break-if->=
-      print-string " "
+      print-string-to-screen " "
       col <- increment
       loop
     }
diff --git a/prototypes/browse/4-render-page.mu b/prototypes/browse/4-render-page.mu
index 79457aa0..77fd6b7f 100644
--- a/prototypes/browse/4-render-page.mu
+++ b/prototypes/browse/4-render-page.mu
@@ -48,7 +48,7 @@ fn clear toprow: int, leftcol: int, botrow: int, rightcol: int {
     {
       compare col, rightcol
       break-if->=
-      print-string " "
+      print-string-to-screen " "
       col <- increment
       loop
     }
diff --git a/prototypes/browse/5.mu b/prototypes/browse/5.mu
index 06fa719b..99d176b5 100644
--- a/prototypes/browse/5.mu
+++ b/prototypes/browse/5.mu
@@ -50,7 +50,7 @@ fn clear toprow: int, leftcol: int, botrow: int, rightcol: int {
     {
       compare col, rightcol
       break-if->=
-      print-string " "
+      print-string-to-screen " "
       col <- increment
       loop
     }
diff --git a/prototypes/browse/6.mu b/prototypes/browse/6.mu
index 99080c54..d71db2fb 100644
--- a/prototypes/browse/6.mu
+++ b/prototypes/browse/6.mu
@@ -61,7 +61,7 @@ fn clear toprow: int, leftcol: int, botrow: int, rightcol: int {
     {
       compare col, rightcol
       break-if->=
-      print-string " "
+      print-string-to-screen " "
       col <- increment
       loop
     }
diff --git a/prototypes/browse/7.mu b/prototypes/browse/7.mu
index dd95d67f..db4a7ac9 100644
--- a/prototypes/browse/7.mu
+++ b/prototypes/browse/7.mu
@@ -65,7 +65,7 @@ fn clear toprow: int, leftcol: int, botrow: int, rightcol: int {
     {
       compare col, rightcol
       break-if->=
-      print-string " "
+      print-string-to-screen " "
       col <- increment
       loop
     }
diff --git a/prototypes/browse/8-multiple-pages.mu b/prototypes/browse/8-multiple-pages.mu
index f35a1d1e..25ad0863 100644
--- a/prototypes/browse/8-multiple-pages.mu
+++ b/prototypes/browse/8-multiple-pages.mu
@@ -81,7 +81,7 @@ fn clear toprow: int, leftcol: int, botrow: int, rightcol: int {
     {
       compare col, rightcol
       break-if->=
-      print-string " "
+      print-string-to-screen " "
       col <- increment
       loop
     }
diff --git a/prototypes/browse/9-bold.mu b/prototypes/browse/9-bold.mu
index c2d9bfaa..fca50472 100644
--- a/prototypes/browse/9-bold.mu
+++ b/prototypes/browse/9-bold.mu
@@ -118,7 +118,7 @@ fn clear toprow: int, leftcol: int, botrow: int, rightcol: int {
     {
       compare col, rightcol
       break-if->=
-      print-string " "
+      print-string-to-screen " "
       col <- increment
       loop
     }