fortrangoingonforty/armfortas / 3ed9c10

Browse files

Restore automatic snake movement

Authored by mfwolffe <wolffemf@dukes.jmu.edu>
SHA
3ed9c104a6039a9e93360be97ba4ddf488b9ca26
Parents
a699045
Tree
6b7088c

1 changed file

StatusFile+-
M sample_programs/16_snake_live.s 3 12
sample_programs/16_snake_live.smodified
@@ -42,15 +42,6 @@ _main:
42
     ldr x10, [x9]
42
     ldr x10, [x9]
43
     cbnz x10, .Lfinish
43
     cbnz x10, .Lfinish
44
 
44
 
45
-    adrp x9, _snake_dir_x@PAGE
46
-    add x9, x9, _snake_dir_x@PAGEOFF
47
-    ldr x10, [x9]
48
-    adrp x9, _snake_dir_y@PAGE
49
-    add x9, x9, _snake_dir_y@PAGEOFF
50
-    ldr x11, [x9]
51
-    orr x10, x10, x11
52
-    cbz x10, .Lgame_loop
53
-
54
     bl advance_game
45
     bl advance_game
55
     bl draw_frame
46
     bl draw_frame
56
 
47
 
@@ -352,7 +343,7 @@ init_game:
352
 
343
 
353
     adrp x9, _snake_dir_x@PAGE
344
     adrp x9, _snake_dir_x@PAGE
354
     add x9, x9, _snake_dir_x@PAGEOFF
345
     add x9, x9, _snake_dir_x@PAGEOFF
355
-    mov x10, #0
346
+    mov x10, #1
356
     str x10, [x9]
347
     str x10, [x9]
357
 
348
 
358
     adrp x9, _snake_dir_y@PAGE
349
     adrp x9, _snake_dir_y@PAGE
@@ -803,7 +794,7 @@ draw_frame:
803
 
794
 
804
     adrp x0, _controls_line@PAGE
795
     adrp x0, _controls_line@PAGE
805
     add x0, x0, _controls_line@PAGEOFF
796
     add x0, x0, _controls_line@PAGEOFF
806
-    mov x1, #37
797
+    mov x1, #31
807
     bl write_stdout
798
     bl write_stdout
808
 
799
 
809
     adrp x0, _crlf@PAGE
800
     adrp x0, _crlf@PAGE
@@ -908,7 +899,7 @@ _border_line:
908
     .asciz "+----------------------------------------+"
899
     .asciz "+----------------------------------------+"
909
 
900
 
910
 _controls_line:
901
 _controls_line:
911
-    .asciz "Controls: W A S D start/move, q quits"
902
+    .asciz "Controls: W A S D move, q quits"
912
 
903
 
913
 _not_tty_msg:
904
 _not_tty_msg:
914
     .asciz "16_snake_live.s needs a real terminal (TTY)."
905
     .asciz "16_snake_live.s needs a real terminal (TTY)."