about summary refs log tree commit diff stats
path: root/124next-token.subx
Commit message (Collapse)AuthorAgeFilesLines
* 7842 - new directory organizationKartik K. Agaram2021-03-031-211/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Baremetal is now the default build target and therefore has its sources at the top-level. Baremetal programs build using the phase-2 Mu toolchain that requires a Linux kernel. This phase-2 codebase which used to be at the top-level is now under the linux/ directory. Finally, the phase-2 toolchain, while self-hosting, has a way to bootstrap from a C implementation, which is now stored in linux/bootstrap. The bootstrap C implementation uses some literate programming tools that are now in linux/bootstrap/tools. So the whole thing has gotten inverted. Each directory should build one artifact and include the main sources (along with standard library). Tools used for building it are relegated to sub-directories, even though those tools are often useful in their own right, and have had lots of interesting programs written using them. A couple of things have gotten dropped in this process: - I had old ways to run on just a Linux kernel, or with a Soso kernel. No more. - I had some old tooling for running a single test at the cursor. I haven't used that lately. Maybe I'll bring it back one day. The reorg isn't done yet. Still to do: - redo documentation everywhere. All the README files, all other markdown, particularly vocabulary.md. - clean up how-to-run comments at the start of programs everywhere - rethink what to do with the html/ directory. Do we even want to keep supporting it? In spite of these shortcomings, all the scripts at the top-level, linux/ and linux/bootstrap are working. The names of the scripts also feel reasonable. This is a good milestone to take stock at.
* 6632Kartik Agaram2020-07-111-6/+6
|
* 6612 - reorganize layersKartik Agaram2020-07-051-0/+1925
6acea762 ^
a232af2f ^
93569d9d ^
a232af2f ^




6acea762 ^
a232af2f ^

6acea762 ^
a232af2f ^






6acea762 ^
a232af2f ^


8f482733 ^
2bf1f311 ^
8f482733 ^
















895d4102 ^
8f482733 ^
a232af2f ^
895d4102 ^

a232af2f ^
b4785580 ^
6acea762 ^
a232af2f ^

6acea762 ^
a232af2f ^

6acea762 ^
a232af2f ^


6acea762 ^
a232af2f ^



3315a7d3 ^
a232af2f ^





6acea762 ^
a232af2f ^



c1207675 ^
a232af2f ^



6acea762 ^
a232af2f ^

6acea762 ^
a232af2f ^

6acea762 ^
a232af2f ^








b4785580 ^
ee36db40 ^
a232af2f ^

6acea762 ^

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
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129






                                                                  

                                                     

                                                    

                     
                           





                                                                  
                 

                     
      

                                   
                       
    
         




                                 
                         

      
                     






                     
                                                          


                                                            
 
                                           
















                                                                                                  
                                    
                                                                               
   

        
 
                                                                    
                                                               

                                 
                                   

                                                                                       
                               


                                                                                
                                              



                                                                               
                                                           





                                     
                                                                    



                                                                                                                                                  
                                                                                                             



                          
                                 

                           
                                                                                     

                              
                                    








                                                       
                                                                                                    
                                                      

                          

      
#!/bin/sh
set -e  # stop immediately on error

# [0-9]*.cc -> mu.cc -> .build/*.cc -> .build/*.o -> .build/mu_bin
# (layers)   |        |              |             |
#          tangle  cleave          $CXX          $CXX

# can also be called with a layer to only build until
#   $ ./build --until 050
# returns 0 on successful build or nothing to build;
# non-zero exit status only on error during building
UNTIL_LAYER=${2:-zzz}

test $CXX || export CXX=c++
test $CC || export CC=cc
test $CFLAGS || export CFLAGS="-g -O3"
export CFLAGS="$CFLAGS -Wall -Wextra -ftrapv -fno-strict-aliasing"

# return 1 if $1 is older than _any_ of the remaining args
older_than() {
  local target=$1
  shift
  if [ ! -e $target ]
  then
#?     echo "$target doesn't exist"
    echo "updating $target" >&2
    return 0  # success
  fi
  local f
  for f in $*
  do
    if [ $f -nt $target ]
    then
      echo "updating $target" >&2
      return 0  # success
    fi
  done
  return 1  # failure
}

noisy_cd() {
  cd $1
  echo "-- `pwd`" >&2
}

older_than enumerate/enumerate enumerate/enumerate.cc && {
  $CXX $CFLAGS enumerate/enumerate.cc -o enumerate/enumerate
}

(
  older_than tangle/tangle tangle/*.cc && {
    noisy_cd tangle
      older_than type_list [0-9]*.cc && {
        grep -h "^struct .* {" [0-9]*.cc |sed 's/\(struct *[^ ]*\).*/\1;/' > type_list
        grep -h "^typedef " [0-9]*.cc >> type_list
      }
      older_than function_list [0-9]*.cc && {
        grep -h "^[^ #].*) {" [0-9]*.cc |sed 's/ {.*/;/' > function_list
      }
      older_than file_list [0-9]*.cc && {
        ls [0-9]*.cc |grep -v "\.test\.cc$" |sed 's/.*/#include "&"/' > file_list
      }
      older_than test_file_list [0-9]*.test.cc && {
        ls [0-9]*.test.cc |sed 's/.*/#include "&"/' > test_file_list
      }
      older_than test_list [0-9]*.cc && {
        grep -h "^[[:space:]]*void test_" [0-9]*.cc |sed 's/^\s*void \(.*\)() {$/\1,/' > test_list
      }
      $CXX $CFLAGS boot.cc -o tangle
    noisy_cd ..  # no effect; just to show us returning to the parent directory
  }
  exit 0
)

LAYERS=$(./enumerate/enumerate --until $UNTIL_LAYER |grep -v '.mu$')
older_than mu.cc $LAYERS enumerate/enumerate tangle/tangle && {
  ./tangle/tangle $LAYERS > mu.cc
}
older_than function_list mu.cc && {
  grep -h "^[^[:space:]#].*) {$" mu.cc |grep -v ":.*(" |sed 's/ {.*/;/' > function_list
}
older_than test_list mu.cc && {
  grep -h "^\s*void test_" mu.cc |sed 's/^\s*void \(.*\)() {.*/\1,/' > test_list
}

older_than cleave/cleave cleave/cleave.cc && {
  $CXX -O3 -Wall -Wextra -fno-strict-aliasing cleave/cleave.cc -o cleave/cleave
  rm -rf .build
}

older_than mu_bin mu.cc *_list cleave/cleave termbox/* && {
  mkdir -p .build
  cp function_list test_list .build
  mkdir -p .build/termbox
  cp termbox/termbox.h .build/termbox
  ./cleave/cleave mu.cc .build
  noisy_cd .build
    older_than global_declarations_list global_definitions_list && {
      grep ';' global_definitions_list |sed 's/[=(].*/;/' |sed 's/^[^\/# ]/extern &/' |sed 's/^extern extern /extern /' > global_declarations_list
    }
    for f in mu_*.cc
    do
      older_than `echo $f |sed 's/\.cc$/.o/'` $f header global_declarations_list function_list test_list && {
        $CXX $CFLAGS -c $f
      }
    done
  noisy_cd ../termbox
    older_than utf8.o utf8.c && {
      $CC $CFLAGS -c utf8.c
    }
    older_than termbox.o termbox.c termbox.h input.inl output.inl bytebuffer.inl && {
      $CC $CFLAGS -c termbox.c
    }
    older_than libtermbox.a *.o && {
      ar rcs libtermbox.a *.o
    }
  noisy_cd ..
  $CXX .build/*.o termbox/libtermbox.a -o .build/mu_bin
  cp .build/mu_bin .
}

## [0-9]*.mu -> core.mu

MU_LAYERS=$(./enumerate/enumerate --until $UNTIL_LAYER |grep '.mu$') || exit 0  # ok if no .mu files
older_than core.mu $MU_LAYERS enumerate/enumerate && {
  cat $MU_LAYERS > core.mu
}

exit 0