[interpreter] Directory reorg (WebAssembly#500)

Reorganise directory structure of interpreter sources into smaller parts that match structure of spec document. The prior spec/ directory is split into * `syntax`: the definition of abstract syntax; corresponds to the "Structure" section * `valid`: validation of code and modules; corresponds to the "Validation" section * `exec`: execution and module instantiation; corresponds to the "Execution" section * `binary`: encoding and decoding of binary format; corresponds to the "Binary Format" section * `text`: parsing and printing of text format; corresponds to the "Text Format" section Similarly, the former host/ directory is split into * `script`: abstract syntax and execution of the extended script language * `main`: main program The former host/imports becomes just host/. And finally, the auxiliary directories `findlib`, `jslib`, and `travis` are moved under `meta/`. Also, bump version of the interpreter to 1.0 and update `wast.js`.
swasey · Jun 13, 2017 · 20e4bd8 · 20e4bd8
1 parent 3099b6f
commit 20e4bd8
Show file tree

Hide file tree

Showing 59 changed files with 4,012 additions and 4,454 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,9 +2,9 @@ language: c++
 
 sudo: off
 
-install: ./interpreter/travis/install-ocaml.sh
+install: ./interpreter/meta/travis/install-ocaml.sh
 
-script: ./interpreter/travis/build-test.sh
+script: ./interpreter/meta/travis/build-test.sh
 
 os:
   - linux

diff --git a/interpreter/Makefile b/interpreter/Makefile
@@ -17,7 +17,7 @@ ZIP =		$(NAME).zip
 JSLIB =		wast.js
 WINMAKE =	winmake.bat
 
-DIRS =		util spec text host host/import
+DIRS =		util syntax binary text valid exec script host main
 LIBS =		bigarray
 FLAGS = 	-cflags '-w +a-4-27-42-44-45 -warn-error +a'
 OCB =		ocamlbuild $(FLAGS) $(DIRS:%=-I %) $(LIBS:%=-libs %)
@@ -26,36 +26,48 @@ JS =		# set to JS shell command to run JS tests
 
 # Main targets
 
-.PHONY:		default opt unopt libopt libunopt all land zip
+.PHONY:		default opt unopt libopt libunopt jslib all land zip
 
 default:	opt
 opt:		$(OPT)
 unopt:		$(UNOPT)
 libopt:		_build/$(LIB).cmx
 libunopt:	_build/$(LIB).cmo
+jslib:		$(JSLIB)
 all:		unopt opt libunopt libopt test
 land:		all $(WINMAKE)
 zip: 		$(ZIP)
 
 
 # Building executable
 
+empty =
+space =		$(empty) $(empty)
+comma =		,
+
+.INTERMEDIATE:	_tags
+_tags:
+		echo >$@ "true: bin_annot"
+		echo >>$@ "<{$(subst $(space),$(comma),$(DIRS))}/*.cmx>: for-pack($(PACK))"
+
 $(UNOPT):	main.d.byte
 		mv $< $@
 
 $(OPT):		main.native
 		mv $< $@
 
 .PHONY:		main.d.byte main.native
-main.d.byte:
+main.d.byte:	_tags
 		$(OCB) -quiet $@
 
-main.native:
+main.native:	_tags
 		$(OCB) -quiet $@
 
 
 # Building library
 
+PACK =		$(shell echo `echo $(LIB) | sed 's/^\(.\).*$$/\\1/g' | tr [:lower:] [:upper:]``echo $(LIB) | sed 's/^.\(.*\)$$/\\1/g'`)
+
 .INTERMEDIATE:	$(LIB).mlpack
 $(LIB).mlpack:	$(DIRS)
 		ls $(DIRS:%=%/*.ml*) \
@@ -76,8 +88,8 @@ _build/$(LIB).cmx: $(LIB).mlpack
 .PHONY:		$(JSLIB)
 $(JSLIB):	$(UNOPT)
 		mkdir -p _build/jslib/src
-		cp jslib/* _build/jslib
-		cp $(DIRS:%=_build/%/*.ml*) jslib/*.ml _build/jslib/src
+		cp meta/jslib/* _build/jslib
+		cp $(DIRS:%=_build/%/*.ml*) meta/jslib/*.ml _build/jslib/src
 		rm _build/jslib/src/*.ml[^i]
 		(cd _build/jslib; ./build.sh ../../$@)
 
@@ -124,7 +136,7 @@ $(ZIP):		$(WINMAKE)
 		git archive --format=zip --prefix=$(NAME)/ -o $@ HEAD
 
 clean:
-		rm -rf _build/jslib wasm.mlpack
+		rm -rf _build/jslib wasm.mlpack _tags
 		$(OCB) -clean
 
 
@@ -138,7 +150,7 @@ check:
 		ocamlfind query $(LIBS)
 
 install:	_build/$(LIB).cmx _build/$(LIB).cmo
-		ocamlfind install wasm findlib/META _build/wasm.o \
+		ocamlfind install wasm meta/findlib/META _build/wasm.o \
 		  $(wildcard _build/$(LIB).cm*) \
 		  $(wildcard $(DIRS:%=%/*.mli))
 

diff --git a/interpreter/README.md b/interpreter/README.md
@@ -354,13 +354,23 @@ However, to simplify the implementation, this AST representation represents some
 
 ## Implementation
 
-The implementation is split into four directories:
+The implementation is split into several directories:
 
-* `spec`: the part of the implementation that corresponds to the actual language specification.
+* `syntax`: the definition of abstract syntax; corresponds to the "Structure" section of the language specification
 
-* `text`: parsing and printing the S-expressions text format.
+* `valid`: validation of code and modules; corresponds to the "Validation" section of the language specification
 
-* `host`: infrastructure for loading and running scripts and defining host environment modules.
+* `exec`: execution and module instantiation; corresponds to the "Execution" section of the language specification
+
+* `binary`: encoding and decoding of the binary format; corresponds to the "Binary Format" section of the language specification
+
+* `text`: parsing and printing the S-expressions text format; corresponds to the "Text Format" section of the language specification
+
+* `script`: abstract syntax and execution of the extended script language
+
+* `host`: definition of host environment modules
+
+* `main`: main program
 
 * `util`: utility libraries.
 

diff --git a/interpreter/_tags b/interpreter/_tags
diff --git a/interpreter/spec/decode.ml → interpreter/binary/decode.ml b/interpreter/spec/decode.ml → interpreter/binary/decode.ml
diff --git a/interpreter/spec/decode.mli → interpreter/binary/decode.mli b/interpreter/spec/decode.mli → interpreter/binary/decode.mli
diff --git a/interpreter/spec/encode.ml → interpreter/binary/encode.ml b/interpreter/spec/encode.ml → interpreter/binary/encode.ml
diff --git a/interpreter/spec/encode.mli → interpreter/binary/encode.mli b/interpreter/spec/encode.mli → interpreter/binary/encode.mli
diff --git a/interpreter/spec/utf8.ml → interpreter/binary/utf8.ml b/interpreter/spec/utf8.ml → interpreter/binary/utf8.ml
diff --git a/interpreter/spec/utf8.mli → interpreter/binary/utf8.mli b/interpreter/spec/utf8.mli → interpreter/binary/utf8.mli
diff --git a/interpreter/spec/eval.ml → interpreter/exec/eval.ml b/interpreter/spec/eval.ml → interpreter/exec/eval.ml
diff --git a/interpreter/spec/eval.mli → interpreter/exec/eval.mli b/interpreter/spec/eval.mli → interpreter/exec/eval.mli
diff --git a/interpreter/spec/eval_numeric.ml → interpreter/exec/eval_numeric.ml b/interpreter/spec/eval_numeric.ml → interpreter/exec/eval_numeric.ml
diff --git a/interpreter/spec/eval_numeric.mli → interpreter/exec/eval_numeric.mli b/interpreter/spec/eval_numeric.mli → interpreter/exec/eval_numeric.mli
diff --git a/interpreter/spec/f32.ml → interpreter/exec/f32.ml b/interpreter/spec/f32.ml → interpreter/exec/f32.ml
diff --git a/interpreter/spec/f32_convert.ml → interpreter/exec/f32_convert.ml b/interpreter/spec/f32_convert.ml → interpreter/exec/f32_convert.ml
diff --git a/interpreter/spec/f32_convert.mli → interpreter/exec/f32_convert.mli b/interpreter/spec/f32_convert.mli → interpreter/exec/f32_convert.mli
diff --git a/interpreter/spec/f64.ml → interpreter/exec/f64.ml b/interpreter/spec/f64.ml → interpreter/exec/f64.ml
diff --git a/interpreter/spec/f64_convert.ml → interpreter/exec/f64_convert.ml b/interpreter/spec/f64_convert.ml → interpreter/exec/f64_convert.ml
diff --git a/interpreter/spec/f64_convert.mli → interpreter/exec/f64_convert.mli b/interpreter/spec/f64_convert.mli → interpreter/exec/f64_convert.mli
diff --git a/interpreter/spec/float.ml → interpreter/exec/float.ml b/interpreter/spec/float.ml → interpreter/exec/float.ml
diff --git a/interpreter/spec/i32.ml → interpreter/exec/i32.ml b/interpreter/spec/i32.ml → interpreter/exec/i32.ml
diff --git a/interpreter/spec/i32_convert.ml → interpreter/exec/i32_convert.ml b/interpreter/spec/i32_convert.ml → interpreter/exec/i32_convert.ml
diff --git a/interpreter/spec/i32_convert.mli → interpreter/exec/i32_convert.mli b/interpreter/spec/i32_convert.mli → interpreter/exec/i32_convert.mli
diff --git a/interpreter/spec/i64.ml → interpreter/exec/i64.ml b/interpreter/spec/i64.ml → interpreter/exec/i64.ml
diff --git a/interpreter/spec/i64_convert.ml → interpreter/exec/i64_convert.ml b/interpreter/spec/i64_convert.ml → interpreter/exec/i64_convert.ml
diff --git a/interpreter/spec/i64_convert.mli → interpreter/exec/i64_convert.mli b/interpreter/spec/i64_convert.mli → interpreter/exec/i64_convert.mli
diff --git a/interpreter/spec/instance.ml → interpreter/exec/instance.ml b/interpreter/spec/instance.ml → interpreter/exec/instance.ml
diff --git a/interpreter/spec/int.ml → interpreter/exec/int.ml b/interpreter/spec/int.ml → interpreter/exec/int.ml
diff --git a/interpreter/spec/memory.ml → interpreter/exec/memory.ml b/interpreter/spec/memory.ml → interpreter/exec/memory.ml
diff --git a/interpreter/spec/memory.mli → interpreter/exec/memory.mli b/interpreter/spec/memory.mli → interpreter/exec/memory.mli
diff --git a/interpreter/spec/numeric_error.ml → interpreter/exec/numeric_error.ml b/interpreter/spec/numeric_error.ml → interpreter/exec/numeric_error.ml
diff --git a/interpreter/spec/table.ml → interpreter/exec/table.ml b/interpreter/spec/table.ml → interpreter/exec/table.ml
diff --git a/interpreter/spec/table.mli → interpreter/exec/table.mli b/interpreter/spec/table.mli → interpreter/exec/table.mli
diff --git a/interpreter/host/import/env.ml → interpreter/host/env.ml b/interpreter/host/import/env.ml → interpreter/host/env.ml
diff --git a/interpreter/host/import/spectest.ml → interpreter/host/spectest.ml b/interpreter/host/import/spectest.ml → interpreter/host/spectest.ml
diff --git a/interpreter/host/flags.ml → interpreter/main/flags.ml b/interpreter/host/flags.ml → interpreter/main/flags.ml
diff --git a/interpreter/host/main.ml → interpreter/main/main.ml b/interpreter/host/main.ml → interpreter/main/main.ml
@@ -1,14 +1,12 @@
 let name = "wasm"
-let version = "0.7"
+let version = "1.0"
 
 let configure () =
   Import.register (Utf8.decode "spectest") Spectest.lookup;
   Import.register (Utf8.decode "env") Env.lookup
 
 let banner () =
-  print_endline
-    (name ^ "-" ^ Printf.sprintf "0x%lX" Encode.version ^
-     " " ^ version ^ " reference interpreter")
+  print_endline (name ^ " " ^ version ^ " reference interpreter")
 
 let usage = "Usage: " ^ name ^ " [option] [file ...]"
 

diff --git a/interpreter/findlib/META → interpreter/meta/findlib/META b/interpreter/findlib/META → interpreter/meta/findlib/META
diff --git a/interpreter/jslib/bsconfig.json → interpreter/meta/jslib/bsconfig.json b/interpreter/jslib/bsconfig.json → interpreter/meta/jslib/bsconfig.json
diff --git a/interpreter/jslib/build.sh → interpreter/meta/jslib/build.sh b/interpreter/jslib/build.sh → interpreter/meta/jslib/build.sh
@@ -74,7 +74,7 @@ echo 1>&2 ==== Compiling ====
 BSPATH=`which bsb`
 BPATH=`dirname $BSPATH`/../lib/js
 echo 1>&2 BSPATH = $BSPATH
-bsb || exit 1
+bsb.exe || exit 1
 cp `dirname $BSPATH`/../lib/js/*.js lib/js/src
 
 echo 1>&2 ==== Linking full version ====

diff --git a/interpreter/jslib/wasm.ml → interpreter/meta/jslib/wasm.ml b/interpreter/jslib/wasm.ml → interpreter/meta/jslib/wasm.ml
diff --git a/interpreter/travis/build-test.sh → interpreter/meta/travis/build-test.sh b/interpreter/travis/build-test.sh → interpreter/meta/travis/build-test.sh
@@ -5,7 +5,7 @@ set -x
 
 # Move to a location relative to the script so it runs
 # from anywhere.
-cd $(dirname ${BASH_SOURCE[0]})/..
+cd $(dirname ${BASH_SOURCE[0]})/../..
 
 export PATH=$PWD/../ocaml/install/bin:$PATH
 

diff --git a/interpreter/travis/install-ocaml.sh → interpreter/meta/travis/install-ocaml.sh b/interpreter/travis/install-ocaml.sh → interpreter/meta/travis/install-ocaml.sh
@@ -3,11 +3,11 @@
 set -e
 
 # Move to a location relative to the script so it runs
-# from anywhere. Go two levels down to get out of interpreter/
+# from anywhere. Go three levels down to get out of interpreter/
 # and into the top-level dir, since we'll run ocamlbuild
 # inside of interpreter/ and it goes pear-shaped if it
 # encounters ocaml's own build directory.
-cd $(dirname ${BASH_SOURCE[0]})/../..
+cd $(dirname ${BASH_SOURCE[0]})/../../..
 
 rm -rf ocaml
 mkdir ocaml

diff --git a/interpreter/host/import.ml → interpreter/script/import.ml b/interpreter/host/import.ml → interpreter/script/import.ml
diff --git a/interpreter/host/import.mli → interpreter/script/import.mli b/interpreter/host/import.mli → interpreter/script/import.mli
diff --git a/interpreter/host/js.ml → interpreter/script/js.ml b/interpreter/host/js.ml → interpreter/script/js.ml
diff --git a/interpreter/host/js.mli → interpreter/script/js.mli b/interpreter/host/js.mli → interpreter/script/js.mli
diff --git a/interpreter/host/run.ml → interpreter/script/run.ml b/interpreter/host/run.ml → interpreter/script/run.ml
diff --git a/interpreter/host/run.mli → interpreter/script/run.mli b/interpreter/host/run.mli → interpreter/script/run.mli
diff --git a/interpreter/text/script.ml → interpreter/script/script.ml b/interpreter/text/script.ml → interpreter/script/script.ml
diff --git a/interpreter/spec/ast.ml → interpreter/syntax/ast.ml b/interpreter/spec/ast.ml → interpreter/syntax/ast.ml
diff --git a/interpreter/spec/operators.ml → interpreter/syntax/operators.ml b/interpreter/spec/operators.ml → interpreter/syntax/operators.ml
diff --git a/interpreter/spec/types.ml → interpreter/syntax/types.ml b/interpreter/spec/types.ml → interpreter/syntax/types.ml
diff --git a/interpreter/spec/values.ml → interpreter/syntax/values.ml b/interpreter/spec/values.ml → interpreter/syntax/values.ml
diff --git a/interpreter/spec/valid.ml → interpreter/valid/valid.ml b/interpreter/spec/valid.ml → interpreter/valid/valid.ml
diff --git a/interpreter/spec/valid.mli → interpreter/valid/valid.mli b/interpreter/spec/valid.mli → interpreter/valid/valid.mli