From c1e841fc2dc43cd94e993165ff0fbde12fd0ec15 Mon Sep 17 00:00:00 2001
From: "Kartik K. Agaram" <vc@akkartik.com>
Date: Tue, 9 Feb 2021 20:53:47 -0800
Subject: [PATCH] 7701

---
 baremetal/501draw-text.mu | 8 ++++----
 baremetal/ex7.mu          | 8 ++++----
 baremetal/rpn.mu          | 2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/baremetal/501draw-text.mu b/baremetal/501draw-text.mu
index b9fc274f..ba1d4805 100644
--- a/baremetal/501draw-text.mu
+++ b/baremetal/501draw-text.mu
@@ -1,6 +1,6 @@
 # some primitives for moving the cursor without making assumptions about
 # raster order
-fn cursor-left screen: (addr screen) {
+fn move-cursor-left screen: (addr screen) {
   var cursor-x/eax: int <- copy 0
   var cursor-y/ecx: int <- copy 0
   cursor-x, cursor-y <- cursor-position screen
@@ -13,7 +13,7 @@ fn cursor-left screen: (addr screen) {
   set-cursor-position screen, cursor-x, cursor-y
 }
 
-fn cursor-right screen: (addr screen) {
+fn move-cursor-right screen: (addr screen) {
   var _width/eax: int <- copy 0
   var dummy/ecx: int <- copy 0
   _width, dummy <- screen-size screen
@@ -31,7 +31,7 @@ fn cursor-right screen: (addr screen) {
   set-cursor-position screen, cursor-x, cursor-y
 }
 
-fn cursor-up screen: (addr screen) {
+fn move-cursor-up screen: (addr screen) {
   var cursor-x/eax: int <- copy 0
   var cursor-y/ecx: int <- copy 0
   cursor-x, cursor-y <- cursor-position screen
@@ -44,7 +44,7 @@ fn cursor-up screen: (addr screen) {
   set-cursor-position screen, cursor-x, cursor-y
 }
 
-fn cursor-down screen: (addr screen) {
+fn move-cursor-down screen: (addr screen) {
   var dummy/eax: int <- copy 0
   var _height/ecx: int <- copy 0
   dummy, _height <- screen-size screen
diff --git a/baremetal/ex7.mu b/baremetal/ex7.mu
index d6bca444..aa2083c7 100644
--- a/baremetal/ex7.mu
+++ b/baremetal/ex7.mu
@@ -21,28 +21,28 @@ fn main {
       break-if-!=
       var g/eax: grapheme <- copy 0x2d/dash
       draw-grapheme-at-cursor 0/screen, g, 0x31/fg, 0/bg
-      cursor-left 0
+      move-cursor-left 0
     }
     {
       compare key, 0x6a/j
       break-if-!=
       var g/eax: grapheme <- copy 0x7c/vertical-bar
       draw-grapheme-at-cursor 0/screen, g, 0x31/fg, 0/bg
-      cursor-down 0
+      move-cursor-down 0
     }
     {
       compare key, 0x6b/k
       break-if-!=
       var g/eax: grapheme <- copy 0x7c/vertical-bar
       draw-grapheme-at-cursor 0/screen, g, 0x31/fg, 0/bg
-      cursor-up 0
+      move-cursor-up 0
     }
     {
       compare key, 0x6c/l
       break-if-!=
       var g/eax: grapheme <- copy 0x2d/dash
       draw-grapheme-at-cursor 0/screen, g, 0x31/fg, 0/bg
-      cursor-right 0
+      move-cursor-right 0
     }
     loop
   }
diff --git a/baremetal/rpn.mu b/baremetal/rpn.mu
index 65959957..c60d4d87 100644
--- a/baremetal/rpn.mu
+++ b/baremetal/rpn.mu
@@ -38,7 +38,7 @@ fn main -> _/ebx: int {
       append-byte in, key2
       var g/eax: grapheme <- copy key2
       draw-grapheme-at-cursor 0/screen, g, 0xf/fg, 0/bg
-      cursor-right 0
+      move-cursor-right 0
       loop
     }
     # clear cursor