about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2021-06-12 21:43:33 -0700
committerKartik K. Agaram <vc@akkartik.com>2021-06-12 21:58:31 -0700
commitbda6982ba14e1e5c562d86260ad906d9fb29261b (patch)
treeeae02f7dbff05e1508c398c49f4ae225fd77d4b1
parent242b83ed46c0fa376535c7ef0458df1fe0e28ac0 (diff)
downloadmu-bda6982ba14e1e5c562d86260ad906d9fb29261b.tar.gz
fix a bounds check
This should have gotten cleaned up during commit e0f6dd5240 (Mar 23).
-rw-r--r--103grapheme.subx9
1 files changed, 5 insertions, 4 deletions
diff --git a/103grapheme.subx b/103grapheme.subx
index 269e3c02..8f1f9e61 100644
--- a/103grapheme.subx
+++ b/103grapheme.subx
@@ -24,13 +24,14 @@ draw-grapheme-on-real-screen:  # g: grapheme, x: int, y: int, color: int, backgr
     52/push-edx
     53/push-ebx
     56/push-esi
-    # var letter-bitmap/esi = font[g]
+    # esi = g
     8b/-> *(ebp+8) 6/r32/esi
+    # if (g >= 128) return  # characters beyond ASCII currently not supported
+    81 7/subop/compare %esi 0x80/imm32
+    7d/jump-if->= $draw-grapheme-on-real-screen:end/disp8
+    # var letter-bitmap/esi = font[g]
     c1 4/subop/shift-left %esi 4/imm8
     81 0/subop/add %esi Font/imm32
-    # if (letter-bitmap >= 0x9400) return  # characters beyond ASCII currently not supported
-    81 7/subop/compare %esi 0x9400/imm32
-    7d/jump-if->= $draw-grapheme-on-real-screen:end/disp8
     # var ycurr/edx: int = y*16
     8b/-> *(ebp+0x10) 2/r32/edx
     c1 4/subop/shift-left %edx 4/imm8