about summary refs log tree commit diff stats
path: root/apps
diff options
context:
space:
mode:
authorKartik Agaram <vc@akkartik.com>2020-04-06 10:33:33 -0700
committerKartik Agaram <vc@akkartik.com>2020-05-18 00:44:46 -0700
commitdca6839eb51d5330eaa0051a26124818d917b190 (patch)
treee61eb2110cda8f926214f753a92f50e114cdfa91 /apps
parent9a028b3decde570694b9ee9b9e5ef57bb80031a4 (diff)
downloadmu-dca6839eb51d5330eaa0051a26124818d917b190.tar.gz
-
Diffstat (limited to 'apps')
-rw-r--r--apps/survey.subx17


1 files changed, 13 insertions, 4 deletions
diff --git a/apps/survey.subx b/apps/survey.subx
index 37039f55..0ec207b0 100644
--- a/apps/survey.subx
+++ b/apps/survey.subx
@@ -840,6 +840,17 @@ $compute-offsets:construct-next-segment:
     e8/call  next-word/disp32
     # . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               8/imm32           # add to esp
+    # if slice-empty?(segment-tmp) abort
+    # . eax = slice-empty?(segment-tmp)
+    # . . push args
+    68/push  compute-offsets:segment-tmp/imm32
+    # . . call
+    e8/call  slice-empty?/disp32
+    # . . discard args
+    81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
+    # . if (eax != false) abort
+    3d/compare-eax-and  0/imm32/false
+    0f 85/jump-if-!=  $compute-offsets:abort/disp32
 $compute-offsets:update-curr-segment-name:
     # curr-segment-name = slice-to-string(segment-tmp)
     # . eax = slice-to-string(Heap, segment-tmp)
@@ -852,10 +863,6 @@ $compute-offsets:update-curr-segment-name:
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               8/imm32           # add to esp
     # . curr-segment-name = eax
     89/copy                         3/mod/direct    6/rm32/esi    .           .             .           0/r32/eax   .               .                 # copy eax to esi
-    # if empty?(curr-segment-name) abort
-    # . if (eax == 0) abort
-    3d/compare-eax-and  0/imm32
-    0f 84/jump-if-=  $compute-offsets:abort/disp32
     # next-word(line, segment-tmp)
     68/push  compute-offsets:segment-tmp/imm32
     51/push-ecx
@@ -864,7 +871,9 @@ $compute-offsets:update-curr-segment-name:
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               8/imm32           # add to esp
     # if slice-empty?(segment-tmp) abort
     # . eax = slice-empty?(segment-tmp)
+    # . . push args
     68/push  compute-offsets:segment-tmp/imm32
+    # . . call
     e8/call  slice-empty?/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp

 

generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2025-02-18 18:37:33 +0000


 


garam <vc@akkartik.com>  2018-11-30 10:54:42 -0800

4801' href='/akkartik/mu/commit/subx/051test.subx?h=hlt&id=6030d7e2e56d445ca67c6a0e8c9cf33e46bc673c'>6030d7e2 ^

80b6f47e ^

57628c0e ^

ffd4a419 ^

7a583220 ^

33352536 ^


ee9a9237 ^

33352536 ^








6030d7e2 ^

9d27e966 ^

ee9a9237 ^

6030d7e2 ^


ee9a9237 ^

6030d7e2 ^

ee9a9237 ^

33352536 ^

9d27e966 ^

6030d7e2 ^

9d27e966 ^

03d50cc8 ^

9d27e966 ^

ee9a9237 ^

33352536 ^


6030d7e2 ^

ee9a9237 ^

6030d7e2 ^

ee9a9237 ^

33352536 ^

9d27e966 ^

ee9a9237 ^

6030d7e2 ^


ee9a9237 ^

6030d7e2 ^

ee9a9237 ^

33352536 ^

03d50cc8 ^

6030d7e2 ^

03d50cc8 ^

ee9a9237 ^

33352536 ^



7a583220 ^

33352536 ^


6030d7e2 ^

57628c0e ^



e0ffdcd1 ^


57628c0e ^

6030d7e2 ^

9b16f190 ^

6030d7e2 ^


4224ec81 ^

e0ffdcd1 ^

03d50cc8 ^

9b16f190 ^

15ae0717 ^

a9d473e2 ^














ee9a9237 ^



1
2

3

4
5
6

7

8

9

10

11
12
13

14

15

16

17

18

19
20

21

22

23

24

25

26
27

28

29
30
31
32
33
34
35
36

37

38

39

40
41

42

43

44

45

46

47

48

49

50

51

52
53

54

55

56

57

58

59

60

61
62

63

64

65

66

67

68

69

70

71
72
73

74

75
76

77

78
79
80

81
82

83

84

85

86
87

88

89

90

91

92

93
94
95
96
97
98
99
100
101
102
103
104
105
106

107




                          
       


                                                                                                                                                 
 
                     
                              
                   


                                              
              
                                    
                      
                                                                                                                                                                  
                      

                                
                         
 
                                                    
                                                                 
                

                                                                                                                                                                       
                      







                                                                                                                                                                             
                                                    
                             
                   

                           
              
                          
                      
                                                                                                                                                                  
              
                                        
                                   
                       
                             
                   

                                                                                                                                                                             
                           
              
                          
                      
                                                                                                                                                                  
                                 
                   

                           
              
                          
                      
                                                                                                                                                                  
                                 
                                                                                                                                                                                    
                      
                         


                 
                

                                                                                                                                                                       
             


       

                                                         
        
          
           

              
 
                                            
                  
           
 













                                                       
                            
# Rudimentary test harness

== code
#   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

Entry:  # manual test
    # check-ints-equal(34, 34)
    # . . push args
    68/push  "error in check-ints-equal"/imm32
    68/push  34/imm32
    68/push  34/imm32
    # . . call
    e8/call  check-ints-equal/disp32
    # . . discard args
    81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               0xc/imm32         # add to esp
    # syscall(exit, 0)
    bb/copy-to-ebx  0/imm32
    b8/copy-to-eax  1/imm32/exit
    cd/syscall  0x80/imm8

# print msg to stderr if a != b, otherwise print "."
check-ints-equal:  # a : int, b : int, msg : (address array byte)
    # . prologue
    55/push-ebp
    89/copy                         3/mod/direct    5/rm32/ebp    .           .             .           4/r32/esp   .               .                 # copy esp to ebp
    # . save registers
    50/push-eax
    51/push-ecx
    53/push-ebx
    # load first 2 args into eax and ebx
    8b/copy                         1/mod/*+disp8   5/rm32/ebp    .           .             .           0/r32/eax   8/disp8         .                 # copy *(ebp+8) to eax
    8b/copy                         1/mod/*+disp8   5/rm32/ebp    .           .             .           3/r32/ebx   0xc/disp8       .                 # copy *(ebp+12) to ebx
    # if (eax == ebx) success
    39/compare                      3/mod/direct    0/rm32/eax    .           .             .           3/r32/ebx   .               .                 # compare eax and ebx
    75/jump-if-unequal  $check-ints-equal:else/disp8
    # . _write(2/stderr, '.')
    # . . push args
    68/push  "."/imm32
    68/push  2/imm32/stderr
    # . . call
    e8/call  _write/disp32
    # . . discard args
    81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               8/imm32           # add to esp
    # . return
    eb/jump  $check-ints-equal:end/disp8
    # otherwise print error message
$check-ints-equal:else:
    # . _write(2/stderr, msg)
    # . . push args
    8b/copy                         1/mod/*+disp8   5/rm32/ebp    .           .             .           1/r32/ecx   0x10/disp8      .                 # copy *(ebp+16) to ecx
    51/push-ecx
    68/push  2/imm32/stderr
    # . . call
    e8/call  _write/disp32
    # . . discard args
    81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               8/imm32           # add to esp
    # . _write(2/stderr, Newline)
    # . . push args
    68/push  Newline/imm32
    68/push  2/imm32/stderr
    # . . call
    e8/call  _write/disp32
    # . . discard args
    81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               8/imm32           # add to esp
    # increment Num-test-failures
    ff          0/subop/increment   0/mod/indirect  5/rm32/.disp32            .             .           .           Num-test-failures/disp32          # increment *Num-test-failures
$check-ints-equal:end:
    # . restore registers
    5b/pop-to-ebx
    59/pop-to-ecx
    58/pop-to-eax
    # . epilogue
    89/copy                         3/mod/direct    4/rm32/esp    .           .             .           5/r32/ebp   .               .                 # copy ebp to esp
    5d/pop-to-ebp
    c3/return

== data

# length-prefixed string containing just a single newline
# convenient to have when printing messages and so on
Newline:
    # size
    1/imm32
    # data
    0a/newline

# every test failure increments this counter
Num-test-failures:
    0/imm32

# length-prefixed string containing just a single space
Space:
    # size
    1/imm32
    # data
    20/space

# length-prefixed string containing just a single slash
Slash:
    # size
    1/imm32
    # data
    2f/slash

# . . vim:nowrap:textwidth=0






 

generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2025-02-18 18:37:34 +0000