Update compiler to use latest LLVM version

.github/workflows/macos.yml

@@ -16,14 +16,14 @@ on:
 
 jobs:
   build:
-    runs-on: macos-10.15
+    runs-on: macos-14
 
     steps:
     - uses: actions/checkout@v2
     - name: Install dependencies
       run: |
+        brew install llvm
         brew install bdw-gc
-        brew install llvm-hs/llvm/llvm-9
         brew install dwdiff
         brew install coreutils
 

.github/workflows/ubuntu.yml

@@ -10,23 +10,32 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     steps:
     - uses: actions/checkout@v2
     - name: Install dependencies
       run: |
+        sudo apt-get install llvm
         sudo apt-get install clang
         sudo apt-get install libgc-dev
-        sudo apt-get install llvm-9-dev
-        sudo apt-get install libtinfo-dev
         sudo apt-get install dwdiff
 
     # GitHub-hosted runners provide Haskell Stack
     # https://github.com/actions/virtual-environments/blob/master/images/linux/Ubuntu1804-README.md
     # - name: Install Haskell Stack
     #   run: wget -qO- https://get.haskellstack.org/ | sh
 
+    - name: Verify dependencies
+      run: |
+        dpkg -s llvm
+        dpkg -s clang
+        dpkg -s libgc-dev
+        dpkg -s dwdiff
+        llvm-config --version
+        llc --version
+        clang --version
+
     # cache Haskell Stack stuff
     - name: Cache stack global package db
       uses: actions/cache@v1

.gitignore

@@ -58,3 +58,5 @@ README.html
 dist-newstyle
 stack.yaml.lock
 LOG*
+src/c_config
+src/CConfig.hs

Makefile

@@ -7,9 +7,13 @@
 INSTALLBIN=/usr/local/bin
 INSTALLLIB=/usr/local/lib/wybe
 
+# Configure any extra C library and include directories
+EXTRALIBS=-L /usr/local/lib -L /opt/homebrew/lib
+EXTRAINCLUDES=-I /usr/local/include -I /opt/homebrew/include
+
 
 # You shouldn't need to edit anything below here
-VERSION = 0.1
+VERSION = 0.2
 SRCDIR = src
 LIBDIR = wybelibs
 WYBELIBS = wybe.o command_line.o logging.o random.o benchmark.o
@@ -40,7 +44,7 @@ install:	wybemk
 	"$(INSTALLBIN)/wybemk" --force-all $(addsuffix ", $(addprefix "$(INSTALLLIB)/,$(WYBELIBS)))
 
 
-wybemk:	$(SRCDIR)/*.hs $(SRCDIR)/Version.lhs
+wybemk:	$(SRCDIR)/*.hs $(SRCDIR)/CConfig.hs $(SRCDIR)/Version.lhs
 	stack -j3 build && cp "`stack path --local-install-root`/bin/$@" "$@"
 
 libs:	$(addprefix $(LIBDIR)/,$(LIBS))
@@ -53,37 +57,46 @@ $(LIBDIR)/wybe.o:	wybemk $(LIBDIR)/wybe/*.wybe
 
 
 $(LIBDIR)/wybe/cbits.o: $(LIBDIR)/wybe/cbits.c
-	clang $(ISSYSROOT) -I /usr/local/include -c "$<" -o "$@"
+	clang $(ISSYSROOT) $(EXTRAINCLUDES) -c "$<" -o "$@"
 
 
 $(SRCDIR)/Version.lhs:	$(addprefix $(SRCDIR)/,*.hs)
 	@echo -e "Generating Version.lhs for version $(VERSION)"
 	@rm -f "$@"
 	@printf "Version.lhs automatically generated:  DO NOT EDIT\n" > "$@"
 	@printf "\n" >> "$@"
-	@printf "> module Version (version,gitHash,buildDate,libDir) where\n\n" >> "$@"
+	@printf "> module Version (version,gitHash,buildDate,libDir,defaultTriple) where\n\n" >> "$@"
 	@printf "> version :: String\n> version = \"%s\"\n\n" "$(VERSION)" >> "$@"
 	@printf "> gitHash :: String\n> gitHash = \"%s\"\n\n" "`git rev-parse --short HEAD`" >> "$@"
 	@printf "> buildDate :: String\n> buildDate = \"%s\"\n\n" "`date`" >> "$@"
 	@printf "> libDir :: String\n> libDir = \"%s\"\n\n" "$(INSTALLLIB)" >> "$@"
+	@printf "> defaultTriple :: String\n> defaultTriple = \"" >> "$@"
+	@clang --version | sed -n 's/Target: *\(.*\)/\1\"/p' >> "$@"
+	@printf "\n\n" >> "$@"
+
+$(SRCDIR)/CConfig.hs:	$(SRCDIR)/c_config
+	$< > $@
+
+$(SRCDIR)/c_config:	$(SRCDIR)/c_config.c
+	clang $(ISSYSROOT) $(EXTRAINCLUDES) -o $@ $<
+
 
 .PHONY:	doc
 doc:	src/README.md
 
 
 # Assemble README markdown source file automatically
-src/README.md: src/*.hs Makefile src/README.md.intro src/README.md.outro
+src/README.md: src/*.hs Makefile src/README.md.intro src/README.md.outro \
+		src/Compiler.png src/Detail.png
 	cat src/README.md.intro > "$@"
 
 	printf "The source files in this directory and their purposes are:\n\n" >> "$@"
-	printf "| File                         " >> "$@"
-	printf "| Purpose                                                  |\n" >> "$@"
-	printf "| ---------------------------- " >> "$@"
-	printf "| -------------------------------------------------------- |\n" >> "$@"
+	printf "| File | Purpose                                      |\n" >> "$@"
+	printf "| ---- | -------------------------------------------- |\n" >> "$@"
 	for f in src/*.hs ; do \
       b=`basename $$f` ; \
       m=`basename $$f .hs` ; \
-	    printf "| `printf '%-29s' [$$b]\(#$$m\)`| " ; \
+	    printf "| `printf '%-20s' [$$b]\(#$$m\)` | " ; \
 	    sed -n "s/^-- *Purpose *: *\(.*\)/\1/p" $$f | tr -d '\n' ; \
 	    printf " |\n" ; \
 	done >> "$@"
@@ -92,15 +105,16 @@ src/README.md: src/*.hs Makefile src/README.md.intro src/README.md.outro
 	for f in src/*.hs ; do \
       m=`basename $$f .hs` ; \
 	    echo -e ; \
-	    sed -E -e '/^-- *Purpose *:/{s/^-- *Purpose *:/## '"$$m -- "'/; G; p;}' -e '/BEGIN MAJOR DOC/,/END MAJOR DOC/{//d ; s/^-- ? ?//p;}' -e 'd' <$$f ; \
+	    echo -e "## $$m <a id="$$m"></a>" ; \
+	    sed -E -e '/BEGIN MAJOR DOC/,/END MAJOR DOC/{//d ; s/^-- ? ?//p;}' -e 'd' <$$f ; \
 	done >> "$@"
 
 	printf "\n\n" >> "$@"
 	cat src/README.md.outro >> "$@"
 
 
 test:	wybemk
-	@rm -f ERRS ; touch ERRS
+	@rm -f ERRS ; printf "Testing run " > ERRS ; date >> ERRS
 	@rm -f $(LIBDIR)/*.o $(LIBDIR)/wybe/*.o
 	@echo -e "Building $(LIBDIR)/wybe/cbits.o"
 	@make $(LIBDIR)/wybe/cbits.o
@@ -111,4 +125,4 @@ test:	wybemk
 
 clean:
 	stack clean
-	rm -f $(SRCDIR)/*.o $(SRCDIR)/*.hi $(SRCDIR)/Version.lhs documentation/*.pdf publications/*.pdf $(LIBDIR)/*.o $(LIBDIR)/wybe/*.o test-cases/*.o
+	rm -f $(SRCDIR)/*.o $(SRCDIR)/*.hi $(SRCDIR)/Version.lhs $(SRCDIR)/CConfig.hs documentation/*.pdf publications/*.pdf $(LIBDIR)/*.o $(LIBDIR)/wybe/*.o test-cases/*.o

TODO.md

@@ -19,7 +19,7 @@
 
 
 ## Error checking:
-* Error if foreign call has no outputs; suggest use !I/O.
+* Error if foreign call has no outputs; suggest `use !io` or make it impure.
 * Ensure no statement binds the same variable multiple times
 
 
@@ -38,11 +38,8 @@
 * Fix the syntax!
     * Support curley braces to specify sets and maps
     * Interpolation (in strings, arrays, sets, and maps)
-        * "...@foo..." means "..." `,,` foo `,,` "..."
-	* "...@(foo(bar,baz))..." means "..." `,,` foo(bar,baz) `,,` "..."
-	* [foo,@bar(baz),zip] means [foo] `,,` bar(baz) `,,` [zip]
-	* if `,,` can run backwards, then [?foo,@?bar] and [@?foo,bar] can be patterns
-    	* with this, do we need `[ ... | ...]` syntax?
+	* "...$(foo(bar,baz))..." means "..." `,,` foo(bar,baz) `,,` "..."
+	* [foo,$bar(baz),zip] means [foo] `,,` bar(baz) `,,` [zip]
 * Support "commutative" resources, which don't need to be threaded everywhere
 * Support unicode
 * Investigate situation calculus
@@ -86,5 +83,4 @@
 
 
 ## Porting:
-* to Windows
 * Rewrite compiler in Wybe

WYBE.md

@@ -95,7 +95,9 @@ Hello, World!
 
 Note that `wybemk` is like `make` in that you give it the name of the
 file you want it to build, and it figures out what files it needs
-to compile.
+to compile.  Currently, the Wybe compiler can generate an executable file, an
+object (.o) file, an LLVM assembler (.ll) file, an LLVM bitcode (.bc), and a
+native assembly language (.s) file from a wybe source file.
 
 ### Compiler Options
 
@@ -108,8 +110,8 @@ can be found with the following:
 
 #### Optimisation Options
 
-The `--llvm-opt-level` (`-O`) options specifies the level of optimisation used
-within the LLVM compiler during the compilations stage of a Wybe module. By default, this is set to 3, yet supports the values 0, 1, 2, or 3. More information
+The `--llvm-opt-level` (-O) option specifies the level of optimisation used
+within the LLVM compiler during the compilation stage of a Wybe module. By default, this is set to 3, yet supports the values 0, 1, 2, or 3. More information
 can be found [here](https://llvm.org/docs/CommandGuide/llc.html#id1).
 
 
@@ -2243,18 +2245,38 @@ Floating point multiplication
 Floating point division
 - `foreign llvm frem(`arg1:float, arg2:float`)`:float
 Floating point remainder
-- `foreign llvm fcmp_eq(`arg1:float, arg2:float`)`:bool
+- `foreign llvm fcmp_ord(`arg1:float, arg2:float`)`:bool
+Floating point ordered (neither is a NaN)
+- `foreign llvm fcmp_oeq(`arg1:float, arg2:float`)`:bool
 Floating point equality
-- `foreign llvm fcmp_ne(`arg1:float, arg2:float`)`:bool
+- `foreign llvm fcmp_one(`arg1:float, arg2:float`)`:bool
 Floating point disequality
-- `foreign llvm fcmp_slt(`arg1:float, arg2:float`)`:bool
+- `foreign llvm fcmp_olt(`arg1:float, arg2:float`)`:bool
 Floating point (signed) strictly less
-- `foreign llvm fcmp_sle(`arg1:float, arg2:float`)`:bool
+- `foreign llvm fcmp_ole(`arg1:float, arg2:float`)`:bool
 Floating point (signed) less or equal
-- `foreign llvm fcmp_sgt(`arg1:float, arg2:float`)`:bool
+- `foreign llvm fcmp_ogt(`arg1:float, arg2:float`)`:bool
 Floating point (signed) strictly greater
-- `foreign llvm fcmp_sge(`arg1:float, arg2:float`)`:bool
+- `foreign llvm fcmp_oge(`arg1:float, arg2:float`)`:bool
 Floating point (signed) greater or equal
+- `foreign llvm fcmp_ord(`arg1:float, arg2:float`)`:bool
+Floating point unordered (either is a NaN)
+- `foreign llvm fcmp_ueq(`arg1:float, arg2:float`)`:bool
+Floating point unordered or equal
+- `foreign llvm fcmp_une(`arg1:float, arg2:float`)`:bool
+Floating point unordered or not equal
+- `foreign llvm fcmp_ult(`arg1:float, arg2:float`)`:bool
+Floating point unordered or strictly less
+- `foreign llvm fcmp_ule(`arg1:float, arg2:float`)`:bool
+Floating point unordered or less or equal
+- `foreign llvm fcmp_ugt(`arg1:float, arg2:float`)`:bool
+Floating point unordered or strictly greater
+- `foreign llvm fcmp_uge(`arg1:float, arg2:float`)`:bool
+Floating point unordered or greater or equal
+- `foreign llvm fcmp_true(`arg1:float, arg2:float`)`:bool
+Always returns true with no comparison
+- `foreign llvm fcmp_false(`arg1:float, arg2:float`)`:bool
+Always returns false with no comparison
 
 #####  <a name="conversion"></a>Integer/floating point conversion
 
@@ -2282,16 +2304,19 @@ declaration has the form:
 where *rep* has one of these forms:
 
 - `address`
-the type is a machine address, similar to the `void *` type in C.
-- *n* `bit` *numbertype*
-a primitive number type comprising *n* bits, where *n* is any non-negative
-integer and *numbertype* is one of:
-  - `signed`
-  a signed integer type
-  - `unsigned`
-  an unsigned integer type
-  - `float`
-  a floating point number; *n* must be 16, 32, 64, or 128.
+ the type is the address of a Wybe data structure.  Foreign code should not
+treat this as an ordinary pointer.
+- `opaque`
+the type is a machine address, similar to the `void *` type in C.  Wybe treats such values as opaque.
+- *n* `bit signed`
+a signed primitive number type comprising *n* bits, where *n* is any non-negative
+integer.  Represents integers between -2<sup>*n*-1</sup> and 2<sup>*n*-1</sup>-1 inclusive.
+- *n* `bit unsigned`
+an unsigned primitive number type comprising *n* bits, where *n* is any non-negative
+integer. Represents integers between 0 and 2<sup>*n*</sup>-1 inclusive.
+- *n* `bit float`
+a floating point number type comprising *n* bits, where *n* is one of 16, 32,
+64, or 128.  
 
 Like a `constructor` declaration, a `representation` declaration makes the
 enclosing module into type.  Also like a `constructor` declaration, a submodule

hello.ll

@@ -0,0 +1,15 @@
+; target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
+target triple = "arm64-apple-macosx14.0.0"
+
+; Declare the string constant as a global constant.
+@.1 = private unnamed_addr constant [17 x i8] c"hello from LLVM!\00"
+
+; External declaration of the puts function
+declare i32 @puts(ptr nocapture) nounwind
+
+; Definition of main function
+define i32 @main() {
+  ; Call puts function to write out the string to stdout.
+  call i32 @puts(ptr @.1)
+  ret i32 0
+}

hie.yaml

@@ -9,9 +9,6 @@ cradle:
     - path: "./src/BinaryFactory.hs"
       component: "wybe:exe:wybemk"
 
-    - path: "./src/Blocks.hs"
-      component: "wybe:exe:wybemk"
-
     - path: "./src/BodyBuilder.hs"
       component: "wybe:exe:wybemk"
 
@@ -24,9 +21,6 @@ cradle:
     - path: "./src/Clause.hs"
       component: "wybe:exe:wybemk"
 
-    - path: "./src/Codegen.hs"
-      component: "wybe:exe:wybemk"
-
     - path: "./src/Config.hs"
       component: "wybe:exe:wybemk"