about summary refs log tree commit diff stats
path: root/subx/examples
diff options
context:
space:
mode:
Diffstat (limited to 'subx/examples')
-rw-r--r--subx/examples/ex1.subx2
-rw-r--r--subx/examples/ex10.subx14
-rw-r--r--subx/examples/ex11.subx142
-rw-r--r--subx/examples/ex12.subx8
-rw-r--r--subx/examples/ex2.subx2
-rw-r--r--subx/examples/ex3.subx8
-rw-r--r--subx/examples/ex4.subx2
-rw-r--r--subx/examples/ex5.subx8
-rw-r--r--subx/examples/ex6.subx8
-rw-r--r--subx/examples/ex7.subx8
-rw-r--r--subx/examples/ex8.subx18
-rw-r--r--subx/examples/ex9.subx16
12 files changed, 118 insertions, 118 deletions
diff --git a/subx/examples/ex1.subx b/subx/examples/ex1.subx
index 8bef59e7..3371cd75 100644
--- a/subx/examples/ex1.subx
+++ b/subx/examples/ex1.subx
@@ -15,4 +15,4 @@ bb/copy-to-EBX  2a/imm32  # 42 in hex
 b8/copy-to-EAX  1/imm32/exit
 cd/syscall  0x80/imm8
 
-# vim:nowrap:textwidth=0
+# . . vim:nowrap:textwidth=0
diff --git a/subx/examples/ex10.subx b/subx/examples/ex10.subx
index 4da713ae..936edb08 100644
--- a/subx/examples/ex10.subx
+++ b/subx/examples/ex10.subx
@@ -8,9 +8,9 @@
 #   0  # false
 
 == code
-#   instruction                     effective address                                                   operand     displacement    immediate
-#   op          subop               mod             rm32          base        index         scale       r32
-#   1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes
+#   instruction                     effective address                                                   register    displacement    immediate
+# . op          subop               mod             rm32          base        index         scale       r32
+# . 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes
 
 # main: return argv-equal(argv[1], argv[2])
 #       At the start of a SubX program:
@@ -18,14 +18,14 @@
 #         argv[0]: *(ESP+4)
 #         argv[1]: *(ESP+8)
 #         ...
-    # prolog
+    # . prolog
     89/copy                         3/mod/direct    5/rm32/EBP    .           .             .           4/r32/ESP   .               .                 # copy ESP to EBP
-    # call argv-equal(argv[1], argv[2])
+    # . . call argv-equal(argv[1], argv[2])
     # push argv[2]
     ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           .           0xc/disp8       .                 # push *(EBP+12)
     # push argv[1]
     ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           .           0x8/disp8       .                 # push *(EBP+8)
-    # call
+    # . . call
     e8/call argv-equal/disp32
     # exit(EAX)
 $exit:
@@ -69,4 +69,4 @@ $argv-equal:false:
     b8/copy-to-EAX  0/imm32
     c3/return
 
-# vim:nowrap:textwidth=0
+# . . vim:nowrap:textwidth=0
diff --git a/subx/examples/ex11.subx b/subx/examples/ex11.subx
index 247a0076..253b91ab 100644
--- a/subx/examples/ex11.subx
+++ b/subx/examples/ex11.subx
@@ -15,9 +15,9 @@
 # would cause tests to not run, rather than to fail as we'd like.)
 
 == code
-#   instruction                     effective address                                                   operand     displacement    immediate
-#   op          subop               mod             rm32          base        index         scale       r32
-#   1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes
+#   instruction                     effective address                                                   register    displacement    immediate
+# . op          subop               mod             rm32          base        index         scale       r32
+# . 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes
 
 # main:
     e8/call  run-tests/disp32  # 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.
@@ -29,10 +29,10 @@
 # compare a null-terminated ascii string with a more idiomatic length-prefixed byte array
 # reason for the name: the only place we should have null-terminated ascii strings is from commandline args
 kernel-string-equal:  # s : null-terminated ascii string, benchmark : length-prefixed ascii string -> EAX : boolean
-    # prolog
+    # . prolog
     55/push-EBP
     89/copy                         3/mod/direct    5/rm32/EBP    .           .             .           4/r32/ESP   .               .                 # copy ESP to EBP
-    # save registers
+    # . save registers
     51/push-ECX
     52/push-EDX
     53/push-EBX
@@ -97,7 +97,7 @@ $kernel-string-equal:false:
     b8/copy-to-EAX  0/imm32
 
 $kernel-string-equal:end:
-    # restore registers
+    # . restore registers
     5f/pop-to-EDI
     5e/pop-to-ESI
     5b/pop-to-EBX
@@ -112,141 +112,141 @@ $kernel-string-equal:end:
 
 test-compare-null-kernel-string-with-empty-array:
     # EAX = kernel-string-equal(Null-kernel-string, "")
-    # push args
+    # . . push args
     68/push  ""/imm32
     68/push  Null-kernel-string/imm32
-    # call
+    # . . call
     e8/call  kernel-string-equal/disp32
-    # discard args
+    # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
-    # call check-ints-equal(EAX, 1, msg)
-    # push args
+    # . . call check-ints-equal(EAX, 1, msg)
+    # . . push args
     68/push  "F - test-compare-null-kernel-string-with-empty-array"/imm32
     68/push  1/imm32/true
     50/push-EAX
-    # call
+    # . . call
     e8/call  check-ints-equal/disp32
-    # discard args
+    # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               0xc/imm32         # add to ESP
     c3/return
 
 test-compare-null-kernel-string-with-non-empty-array:
     # EAX = kernel-string-equal(Null-kernel-string, "Abc")
-    # push args
+    # . . push args
     68/push  "Abc"/imm32
     68/push  Null-kernel-string/imm32
-    # call
+    # . . call
     e8/call  kernel-string-equal/disp32
-    # discard args
+    # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
-    # call check-ints-equal(EAX, 0, msg)
-    # push args
+    # . . call check-ints-equal(EAX, 0, msg)
+    # . . push args
     68/push  "F - test-compare-null-kernel-string-with-non-empty-array"/imm32
     68/push  0/imm32/false
     50/push-EAX
-    # call
+    # . . call
     e8/call  check-ints-equal/disp32
-    # discard args
+    # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               0xc/imm32         # add to ESP
     c3/return
 
 test-compare-kernel-string-with-equal-array:
     # EAX = kernel-string-equal(Abc-kernel-string, "Abc")
-    # push args
+    # . . push args
     68/push  "Abc"/imm32
     68/push  Abc-kernel-string/imm32
-    # call
+    # . . call
     e8/call  kernel-string-equal/disp32
-    # discard args
+    # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
-    # call check-ints-equal(EAX, 1, msg)
-    # push args
+    # . . call check-ints-equal(EAX, 1, msg)
+    # . . push args
     68/push  "F - test-compare-kernel-string-with-equal-array"/imm32
     68/push  1/imm32/true
     50/push-EAX
-    # call
+    # . . call
     e8/call  check-ints-equal/disp32
-    # discard args
+    # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               0xc/imm32         # add to ESP
     c3/return
 
 test-compare-kernel-string-with-inequal-array:
     # EAX = kernel-string-equal(Abc-kernel-string, "Adc")
-    # push args
+    # . . push args
     68/push  "Adc"/imm32
     68/push  Abc-kernel-string/imm32
-    # call
+    # . . call
     e8/call  kernel-string-equal/disp32
-    # discard args
+    # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
-    # call check-ints-equal(EAX, 0, msg)
-    # push args
+    # . . call check-ints-equal(EAX, 0, msg)
+    # . . push args
     68/push  "F - test-compare-kernel-string-with-equal-array"/imm32
     68/push  0/imm32/false
     50/push-EAX
-    # call
+    # . . call
     e8/call  check-ints-equal/disp32
-    # discard args
+    # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               0xc/imm32         # add to ESP
     c3/return
 
 test-compare-kernel-string-with-empty-array:
     # EAX = kernel-string-equal(Abc-kernel-string, "")
-    # push args
+    # . . push args
     68/push  ""/imm32
     68/push  Abc-kernel-string/imm32
-    # call
+    # . . call
     e8/call  kernel-string-equal/disp32
-    # discard args
+    # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
-    # call check-ints-equal(EAX, 0)
-    # push args
+    # . . call check-ints-equal(EAX, 0)
+    # . . push args
     68/push  "F - test-compare-kernel-string-with-equal-array"/imm32
     68/push  0/imm32/false
     50/push-EAX
-    # call
+    # . . call
     e8/call  check-ints-equal/disp32
-    # discard args
+    # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               0xc/imm32         # add to ESP
     c3/return
 
 test-compare-kernel-string-with-shorter-array:
     # EAX = kernel-string-equal(Abc-kernel-string, "Ab")
-    # push args
+    # . . push args
     68/push  "Ab"/imm32
     68/push  Abc-kernel-string/imm32
-    # call
+    # . . call
     e8/call  kernel-string-equal/disp32
-    # discard args
+    # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
-    # call check-ints-equal(EAX, 0)
-    # push args
+    # . . call check-ints-equal(EAX, 0)
+    # . . push args
     68/push  "F - test-compare-kernel-string-with-shorter-array"/imm32
     68/push  0/imm32/false
     50/push-EAX
-    # call
+    # . . call
     e8/call  check-ints-equal/disp32
-    # discard args
+    # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               0xc/imm32         # add to ESP
     c3/return
 
 test-compare-kernel-string-with-longer-array:
     # EAX = kernel-string-equal(Abc-kernel-string, "Abcd")
-    # push args
+    # . . push args
     68/push  "Abcd"/imm32
     68/push  Abc-kernel-string/imm32
-    # call
+    # . . call
     e8/call  kernel-string-equal/disp32
-    # discard args
+    # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
-    # call check-ints-equal(EAX, 0)
-    # push args
+    # . . call check-ints-equal(EAX, 0)
+    # . . push args
     68/push  "F - test-compare-kernel-string-with-longer-array"/imm32
     68/push  0/imm32/false
     50/push-EAX
-    # call
+    # . . call
     e8/call  check-ints-equal/disp32
-    # discard args
+    # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               0xc/imm32         # add to ESP
     c3/return
 
@@ -254,10 +254,10 @@ test-compare-kernel-string-with-longer-array:
 
 # print msg to stderr if a != b, otherwise print "."
 check-ints-equal:  # (a : int, b : int, msg : (address array byte)) -> boolean
-    # prolog
+    # . prolog
     55/push-EBP
     89/copy                         3/mod/direct    5/rm32/EBP    .           .             .           4/r32/ESP   .               .                 # copy ESP to EBP
-    # save registers
+    # . save registers
     51/push-ECX
     53/push-EBX
     # load args into EAX, EBX and ECX
@@ -267,11 +267,11 @@ check-ints-equal:  # (a : int, b : int, msg : (address array byte)) -> boolean
     39/compare                      3/mod/direct    0/rm32/EAX    .           .             .           3/r32/EBX   .               .                 # compare EAX and EBX
     75/jump-if-unequal  $check-ints-equal:else/disp8
     # print('.')
-      # push args
+    # . . push args
     68/push  "."/imm32
-      # call
+    # . . call
     e8/call  write-stderr/disp32
-      # discard args
+    # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
     # return
     eb/jump  $check-ints-equal:end/disp8
@@ -280,21 +280,21 @@ $check-ints-equal:else:
     # copy msg into ECX
     8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           1/r32/ECX   0x10/disp8       .                # copy *(EBP+16) to ECX
     # print(ECX)
-      # push args
+    # . . push args
     51/push-ECX
-      # call
+    # . . call
     e8/call  write-stderr/disp32
-      # discard args
+    # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
     # print newline
-      # push args
+    # . . push args
     68/push  Newline/imm32
-      # call
+    # . . call
     e8/call  write-stderr/disp32
-      # discard args
+    # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
 $check-ints-equal:end:
-    # restore registers
+    # . restore registers
     5b/pop-to-EBX
     59/pop-to-ECX
     # end
@@ -303,10 +303,10 @@ $check-ints-equal:end:
     c3/return
 
 write-stderr:  # s : (address array byte) -> <void>
-    # prolog
+    # . prolog
     55/push-EBP
     89/copy                         3/mod/direct    5/rm32/EBP    .           .             .           4/r32/ESP   .               .                 # copy ESP to EBP
-    # save registers
+    # . save registers
     50/push-EAX
     51/push-ECX
     52/push-EDX
@@ -323,7 +323,7 @@ write-stderr:  # s : (address array byte) -> <void>
     # syscall
     b8/copy-to-EAX  4/imm32/write
     cd/syscall  0x80/imm8
-    # restore registers
+    # . restore registers
     5b/pop-to-EBX
     5a/pop-to-EDX
     59/pop-to-ECX
@@ -347,4 +347,4 @@ Null-kernel-string:
 Abc-kernel-string:
     41/A 62/b 63/c 00/null
 
-# vim:nowrap:textwidth=0
+# . . vim:nowrap:textwidth=0
diff --git a/subx/examples/ex12.subx b/subx/examples/ex12.subx
index 73d78d96..565c8d50 100644
--- a/subx/examples/ex12.subx
+++ b/subx/examples/ex12.subx
@@ -7,9 +7,9 @@
 # You shouldn't get a segmentation fault.
 
 == code
-#   instruction                     effective address                                                   operand     displacement    immediate
-#   op          subop               mod             rm32          base        index         scale       r32
-#   1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes
+#   instruction                     effective address                                                   register    displacement    immediate
+# . op          subop               mod             rm32          base        index         scale       r32
+# . 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes
 
     # syscall(mmap, 0x1000)
     bb/copy-to-EBX  Mmap-new-segment/imm32
@@ -41,4 +41,4 @@ Mmap-new-segment:  # type mmap_arg_struct
     # offset
     00 00 00 00  # 0 since MAP_ANONYMOUS is specified
 
-# vim:nowrap:textwidth=0
+# . . vim:nowrap:textwidth=0
diff --git a/subx/examples/ex2.subx b/subx/examples/ex2.subx
index 09fe4414..f7be9b65 100644
--- a/subx/examples/ex2.subx
+++ b/subx/examples/ex2.subx
@@ -15,4 +15,4 @@ bb/copy-to-EBX  1/imm32
 b8/copy-to-EAX  1/imm32
 cd/syscall  0x80/imm8
 
-# vim:nowrap:textwidth=0
+# . . vim:nowrap:textwidth=0
diff --git a/subx/examples/ex3.subx b/subx/examples/ex3.subx
index b3f7d6fe..b6e21698 100644
--- a/subx/examples/ex3.subx
+++ b/subx/examples/ex3.subx
@@ -8,9 +8,9 @@
 #   55
 
 == code
-#   instruction                     effective address                                                   operand     displacement    immediate
-#   op          subop               mod             rm32          base        index         scale       r32
-#   1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes
+#   instruction                     effective address                                                   register    displacement    immediate
+# . op          subop               mod             rm32          base        index         scale       r32
+# . 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes
 
     # result: EBX = 0
     bb/copy-to-EBX  0/imm32
@@ -33,4 +33,4 @@ $exit:
     b8/copy-to-EAX  1/imm32
     cd/syscall  0x80/imm8
 
-# vim:nowrap:textwidth=0
+# . . vim:nowrap:textwidth=0
diff --git a/subx/examples/ex4.subx b/subx/examples/ex4.subx
index 445f7d1b..2fd15cd7 100644
--- a/subx/examples/ex4.subx
+++ b/subx/examples/ex4.subx
@@ -37,4 +37,4 @@ cd/syscall  0x80/imm8
 X:
     00 00 00 00  # space for read() to write to
 
-# vim:nowrap:textwidth=0
+# . . vim:nowrap:textwidth=0
diff --git a/subx/examples/ex5.subx b/subx/examples/ex5.subx
index 44291b35..136c177b 100644
--- a/subx/examples/ex5.subx
+++ b/subx/examples/ex5.subx
@@ -5,9 +5,9 @@
 #   $ subx run examples/ex5
 
 == code
-#   instruction                     effective address                                                   operand     displacement    immediate
-#   op          subop               mod             rm32          base        index         scale       r32
-#   1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes
+#   instruction                     effective address                                                   register    displacement    immediate
+# . op          subop               mod             rm32          base        index         scale       r32
+# . 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes
 
 # main:
     # allocate x on the stack
@@ -39,4 +39,4 @@
     b8/copy-to-EAX  1/imm32/exit
     cd/syscall  0x80/imm8
 
-# vim:nowrap:textwidth=0
+# . . vim:nowrap:textwidth=0
diff --git a/subx/examples/ex6.subx b/subx/examples/ex6.subx
index 10331808..fc266a3a 100644
--- a/subx/examples/ex6.subx
+++ b/subx/examples/ex6.subx
@@ -6,9 +6,9 @@
 #   Hello, world!
 
 == code
-#   instruction                     effective address                                                   operand     displacement    immediate
-#   op          subop               mod             rm32          base        index         scale       r32
-#   1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes
+#   instruction                     effective address                                                   register    displacement    immediate
+# . op          subop               mod             rm32          base        index         scale       r32
+# . 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes
 
     # syscall(write, stdout, X, size)
     # fd = 1 (stdout)
@@ -33,4 +33,4 @@ X:  # string to print
     48 65 6c 6c 6f 2c 20 77 6f 72 6c 64 21 0a       00
 # H  e  l  l  o  ,  ␣  w  o  r  l  d  !  newline  null
 
-# vim:nowrap:textwidth=0
+# . . vim:nowrap:textwidth=0
diff --git a/subx/examples/ex7.subx b/subx/examples/ex7.subx
index 93b568f9..3650817d 100644
--- a/subx/examples/ex7.subx
+++ b/subx/examples/ex7.subx
@@ -11,9 +11,9 @@
 #   97
 
 == code
-#   instruction                     effective address                                                   operand     displacement    immediate
-#   op          subop               mod             rm32          base        index         scale       r32
-#   1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes
+#   instruction                     effective address                                                   register    displacement    immediate
+# . op          subop               mod             rm32          base        index         scale       r32
+# . 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes
 
     # syscall(creat, Filename)
     bb/copy-to-EBX  Filename/imm32
@@ -101,4 +101,4 @@ B:
 Filename:
     2e 66 6f 6f 00 00 00 00
 
-# vim:nowrap:textwidth=0
+# . . vim:nowrap:textwidth=0
diff --git a/subx/examples/ex8.subx b/subx/examples/ex8.subx
index fd7929f4..410dfe08 100644
--- a/subx/examples/ex8.subx
+++ b/subx/examples/ex8.subx
@@ -15,18 +15,18 @@
 # Locals start from ESP-4 downwards.
 
 == code
-#   instruction                     effective address                                                   operand     displacement    immediate
-#   op          subop               mod             rm32          base        index         scale       r32
-#   1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes
+#   instruction                     effective address                                                   register    displacement    immediate
+# . op          subop               mod             rm32          base        index         scale       r32
+# . 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes
 
-    # prolog
+    # . prolog
     89/copy                         3/mod/direct    5/rm32/EBP    .           .             .           4/r32/ESP   .               .                 # copy ESP to EBP
-    # call ascii-length(argv[1])
-    # push args
+    # . . call ascii-length(argv[1])
+    # . . push args
     ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           .           0x8/disp8       .                 # push *(EBP+8)
-    # call
+    # . . call
     e8/call  ascii-length/disp32
-    # discard args
+    # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
 
     # exit(EAX)
@@ -55,4 +55,4 @@ $ascii-length-ret:
     # return (result in EAX)
     c3/return
 
-# vim:nowrap:textwidth=0
+# . . vim:nowrap:textwidth=0
diff --git a/subx/examples/ex9.subx b/subx/examples/ex9.subx
index 00f2d661..964151a2 100644
--- a/subx/examples/ex9.subx
+++ b/subx/examples/ex9.subx
@@ -17,20 +17,20 @@
 # Locals start from ESP-4 downwards.
 
 == code
-#   instruction                     effective address                                                   operand     displacement    immediate
-#   op          subop               mod             rm32          base        index         scale       r32
-#   1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes
+#   instruction                     effective address                                                   register    displacement    immediate
+# . op          subop               mod             rm32          base        index         scale       r32
+# . 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes
 
-    # prolog
+    # . prolog
     89/copy                         3/mod/direct    5/rm32/EBP    .           .             .           4/r32/ESP   .               .                 # copy ESP to EBP
-    # call ascii-difference(argv[1], argv[2])
+    # . . call ascii-difference(argv[1], argv[2])
     # push argv[2]
     ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           .           0xc/disp8       .                 # push *(EBP+12)
     # push argv[1]
     ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           .           0x8/disp8       .                 # push *(EBP+8)
-    # call
+    # . . call
     e8/call  ascii-difference/disp32
-    # discard args
+    # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
     # exit(EAX)
     89/copy                         3/mod/direct    3/rm32/EBX    .           .             .           0/r32/EAX   .               .                 # copy EAX to EBX
@@ -48,4 +48,4 @@ ascii-difference:  # (s1, s2) : null-terminated ascii strings
     29/subtract                     3/mod/direct    0/rm32/EAX    .           .             .           1/r32/ECX   .               .                 # subtract ECX from EAX
     c3/return
 
-# vim:nowrap:textwidth=0
+# . . vim:nowrap:textwidth=0
an> 'D', 'F', 'G', 'H', 'J', 'K', 'L', ':', // 0x20 '"', '~', NO, '|', 'Z', 'X', 'C', 'V', 'B', 'N', 'M', '<', '>', '?', NO, '*', // 0x30 NO, ' ', NO, NO, NO, NO, NO, NO, NO, NO, NO, NO, NO, NO, NO, '7', // 0x40 '8', '9', '-', '4', '5', '6', '+', '1', '2', '3', '0', '.', NO, NO, NO, NO, // 0x50 [0x49] = KEY_PAGEUP, [0x51] = KEY_PAGEDOWN, [0x47] = KEY_HOME, [0x4F] = KEY_END, [0x52] = KEY_INSERT, [0x53] = KEY_DELETE, [0x48] = KEY_UP, [0x50] = KEY_DOWN, [0x4B] = KEY_LEFT, [0x4D] = KEY_RIGHT, [0x9C] = '\n', // KP_Enter [0xB5] = '/', // KP_Div [0xC8] = KEY_UP, [0xD0] = KEY_DOWN, [0xC9] = KEY_PAGEUP, [0xD1] = KEY_PAGEDOWN, [0xCB] = KEY_LEFT, [0xCD] = KEY_RIGHT, [0x97] = KEY_HOME, [0xCF] = KEY_END, [0xD2] = KEY_INSERT, [0xD3] = KEY_DELETE }; static BOOL tty_open(File *file, uint32 flags); static void tty_close(File *file); static int32 tty_ioctl(File *file, int32 request, void * argp); static int32 tty_read(File *file, uint32 size, uint8 *buffer); static int32 tty_write(File *file, uint32 size, uint8 *buffer); static int32 write(Tty* tty, uint32 size, uint8 *buffer); static uint8 getCharacterForScancode(KeyModifier modifier, uint8 scancode); static void processScancode(uint8 scancode); void initializeTTYs(BOOL graphicMode) { gTtyList = List_Create(); gReaderList = List_Create(); for (int i = 1; i <= 9; ++i) { Tty* tty = NULL; if (graphicMode) { tty = createTty(768 / 16, 1024 / 9, Gfx_FlushFromTty); } else { tty = createTty(25, 80, Screen_FlushFromTty); } tty->color = 0x0A; List_Append(gTtyList, tty); Device device; memset((uint8*)&device, 0, sizeof(Device)); sprintf(device.name, "tty%d", i); device.deviceType = FT_CharacterDevice; device.open = tty_open; device.close = tty_close; device.ioctl = tty_ioctl; device.read = tty_read; device.write = tty_write; device.privateData = tty; registerDevice(&device); } gActiveTty = List_GetFirstNode(gTtyList)->data; } Tty* getActiveTTY() { return gActiveTty; } FileSystemNode* createPseudoTerminal() { Tty* tty = createTty(768 / 16, 1024 / 9, Gfx_FlushFromTty); tty->color = 0x0A; Device device; memset((uint8*)&device, 0, sizeof(Device)); sprintf(device.name, "pts%d", gPseudoTerminalNameGenerator++); device.deviceType = FT_CharacterDevice; device.open = tty_open; device.close = tty_close; device.ioctl = tty_ioctl; device.read = tty_read; device.write = tty_write; device.privateData = tty; FileSystemNode* node = registerDevice(&device); if (NULL == node) { destroyTty(tty); } return node; } static void sendInputToKeyBuffer(Tty* tty, uint8 scancode, uint8 character) { char seq[8]; memset(seq, 0, 8); switch (character) { case KEY_PAGEUP: { seq[0] = 27; seq[1] = 91; seq[2] = 53; seq[3] = 126; FifoBuffer_enqueue(tty->keyBuffer, seq, 4); } break; case KEY_PAGEDOWN: { seq[0] = 27; seq[1] = 91; seq[2] = 54; seq[3] = 126; FifoBuffer_enqueue(tty->keyBuffer, seq, 4); } break; case KEY_HOME: { seq[0] = 27; seq[1] = 91; seq[2] = 72; FifoBuffer_enqueue(tty->keyBuffer, seq, 3); } break; case KEY_END: { seq[0] = 27; seq[1] = 91; seq[2] = 70; FifoBuffer_enqueue(tty->keyBuffer, seq, 3); } break; case KEY_INSERT: { seq[0] = 27; seq[1] = 91; seq[2] = 50; seq[3] = 126; FifoBuffer_enqueue(tty->keyBuffer, seq, 4); } break; case KEY_DELETE: { seq[0] = 27; seq[1] = 91; seq[2] = 51; seq[3] = 126; FifoBuffer_enqueue(tty->keyBuffer, seq, 4); } break; case KEY_UP: { seq[0] = 27; seq[1] = 91; seq[2] = 65; FifoBuffer_enqueue(tty->keyBuffer, seq, 3); } break; case KEY_DOWN: { seq[0] = 27; seq[1] = 91; seq[2] = 66; FifoBuffer_enqueue(tty->keyBuffer, seq, 3); } break; case KEY_RIGHT: { seq[0] = 27; seq[1] = 91; seq[2] = 67; FifoBuffer_enqueue(tty->keyBuffer, seq, 3); } break; case KEY_LEFT: { seq[0] = 27; seq[1] = 91; seq[2] = 68; FifoBuffer_enqueue(tty->keyBuffer, seq, 3); } break; default: FifoBuffer_enqueue(tty->keyBuffer, &character, 1); break; } } void sendKeyInputToTTY(Tty* tty, uint8 scancode) { beginCriticalSection(); processScancode(scancode); uint8 character = getCharacterForScancode(gKeyModifier, scancode); uint8 keyRelease = (0x80 & scancode); //ignore release event if (character > 0 && keyRelease == 0) { //enqueue for non-canonical readers sendInputToKeyBuffer(tty, scancode, character); //FifoBuffer_enqueue(tty->keyBuffer, &scancode, 1); if (tty->lineBufferIndex >= TTY_LINEBUFFER_SIZE - 1) { tty->lineBufferIndex = 0; } if (character == '\b') { if (tty->lineBufferIndex > 0) { tty->lineBuffer[--tty->lineBufferIndex] = '\0'; if ((tty->term.c_lflag & ECHO) == ECHO) { write(tty, 1, &character); } } } else { tty->lineBuffer[tty->lineBufferIndex++] = character; if ((tty->term.c_lflag & ECHO) == ECHO) { write(tty, 1, &character); } } } //Wake readers List_Foreach(n, gReaderList) { File* file = n->data; if (file->thread->state == TS_WAITIO) { if (file->thread->state_privateData == tty) { file->thread->state = TS_RUN; file->thread->state_privateData = NULL; } } } endCriticalSection(); } static BOOL tty_open(File *file, uint32 flags) { //printkf("tty_open: pid:%d\n", file->process->pid); Tty* tty = (Tty*)file->node->privateNodeData; FifoBuffer_clear(tty->keyBuffer); List_Append(gReaderList, file); return TRUE; } static void tty_close(File *file) { List_RemoveFirstOccurrence(gReaderList, file); } static int32 tty_ioctl(File *file, int32 request, void * argp) { Tty* tty = (Tty*)file->node->privateNodeData; switch (request) { case 0: { sendKeyInputToTTY(tty, (uint8)(uint32)argp); return 0; } break; case 1: return tty->columnCount * tty->lineCount * 2; break; case 2: { //set TtyUserBuffer* userTtyBuffer = (TtyUserBuffer*)argp; memcpy(tty->buffer, (uint8*)userTtyBuffer->buffer, tty->columnCount * tty->lineCount * 2); return 0; } break; case 3: { //get TtyUserBuffer* userTtyBuffer = (TtyUserBuffer*)argp; userTtyBuffer->columnCount = tty->columnCount; userTtyBuffer->lineCount = tty->lineCount; userTtyBuffer->currentColumn = tty->currentColumn; userTtyBuffer->currentLine = tty->currentLine; memcpy((uint8*)userTtyBuffer->buffer, tty->buffer, tty->columnCount * tty->lineCount * 2); return 0; } break; case TCGETS: { struct termios* term = (struct termios*)argp; //Debug_PrintF("TCGETS\n"); memcpy((uint8*)term, (uint8*)&(tty->term), sizeof(struct termios)); return 0;//success } break; case TCSETS: case TCSETSW: break; case TCSETSF: { struct termios* term = (struct termios*)argp; //Debug_PrintF("TCSETSF\n"); memcpy((uint8*)&(tty->term), (uint8*)term, sizeof(struct termios)); return 0;//success } break; default: break; } return -1; } static int32 tty_read(File *file, uint32 size, uint8 *buffer) { enableInterrupts(); if (size > 0) { Tty* tty = (Tty*)file->node->privateNodeData; if ((tty->term.c_lflag & ICANON) == ICANON) { while (TRUE) { for (int i = 0; i < tty->lineBufferIndex; ++i) { char chr = tty->lineBuffer[i]; if (chr == '\n') { int bytesToCopy = MIN(tty->lineBufferIndex, size); if (bytesToCopy >= tty->term.c_cc[VMIN]) { tty->lineBufferIndex = 0; memcpy(buffer, tty->lineBuffer, bytesToCopy); return bytesToCopy; } } } file->thread->state = TS_WAITIO; file->thread->state_privateData = tty; halt(); } } else { while (TRUE) { uint32 neededSize = tty->term.c_cc[VMIN]; uint32 bufferLen = FifoBuffer_getSize(tty->keyBuffer); if (bufferLen >= neededSize) { int readSize = FifoBuffer_dequeue(tty->keyBuffer, buffer, MIN(bufferLen, size)); return readSize; } file->thread->state = TS_WAITIO; file->thread->state_privateData = tty; halt(); } } } return -1; } static int32 write(Tty* tty, uint32 size, uint8 *buffer) { buffer[size] = '\0'; Tty_PutText(tty, (const char*)buffer); if (gActiveTty == tty) { if (gActiveTty->flushScreen) { gActiveTty->flushScreen(gActiveTty); } } return size; } static int32 tty_write(File *file, uint32 size, uint8 *buffer) { return write(file->node->privateNodeData, size, buffer); } static void setActiveTty(Tty* tty) { gActiveTty = tty; Gfx_Fill(0xFFFFFFFF); if (tty->flushScreen) { tty->flushScreen(tty); } //Serial_PrintF("line:%d column:%d\r\n", gActiveTty->currentLine, gActiveTty->currentColumn); } BOOL isValidTTY(Tty* tty) { List_Foreach(n, gTtyList) { if (n->data == tty) { return TRUE; } } return FALSE; } static uint8 getCharacterForScancode(KeyModifier modifier, uint8 scancode) { //return gKeyboardLayout[scancode]; if ((modifier & KM_LeftShift) == KM_LeftShift || (modifier & KM_RightShift) == KM_RightShift) { return gKeyShiftMap[scancode]; } return gKeyMap[scancode]; } static void applyModifierKeys(KeyModifier modifier, uint8 scancode) { if ((modifier & KM_Ctrl) == KM_Ctrl) { int ttyIndex = scancode - KEY_F1; //printkf("TTY:%d\n", ttyIndex); int ttyCount = List_GetCount(gTtyList); if (ttyIndex >= 0 && ttyIndex < ttyCount) { int i = 0; List_Foreach(n, gTtyList) { if (ttyIndex == i) { setActiveTty(n->data); break; } ++i; } } } } static void processScancode(uint8 scancode) { uint8 lastBit = scancode & 0x80; scancode &= 0x7F; if (lastBit) { //key release switch (scancode) { case KEY_LEFTSHIFT: gKeyModifier &= ~KM_LeftShift; break; case KEY_RIGHTSHIFT: gKeyModifier &= ~KM_RightShift; break; case KEY_CTRL: gKeyModifier &= ~KM_Ctrl; break; case KEY_ALT: gKeyModifier &= ~KM_Alt; break; } //printkf("released: %x (%d)\n", scancode, scancode); } else { //key pressed switch (scancode) { case KEY_LEFTSHIFT: gKeyModifier |= KM_LeftShift; break; case KEY_RIGHTSHIFT: gKeyModifier |= KM_RightShift; break; case KEY_CTRL: gKeyModifier |= KM_Ctrl; break; case KEY_ALT: gKeyModifier |= KM_Alt; break; } //printkf("pressed: %x (%d)\n", scancode, scancode); applyModifierKeys(gKeyModifier, scancode); } }