From adff006b47b1402706b673be10a3f9a60441d32f Mon Sep 17 00:00:00 2001 From: Kathy Gray Date: Tue, 17 Nov 2015 14:54:22 +0000 Subject: Very nearly there sequential interpreter, just need to hook in the spec files for the different isas to support --- src/Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index 02958c18..f9fb9f5c 100644 --- a/src/Makefile +++ b/src/Makefile @@ -13,6 +13,8 @@ interpreter: elf: ocamlbuild -use-ocamlfind -pkgs batteries,uint,unix,zarith src_elf/main_elf.native + ocamlbuild -use-ocamlfind -pkgs batteries,uint,unix,zarith src_elf/abis/power64/abi_power64.cmxa + ocamlbuild -use-ocamlfind -pkgs batteries,uint,unix,zarith src_elf/abis/aarch64/abi_aarch64_le.cmxa test: sail interpreter ocamlbuild test/run_tests.native -- cgit v1.2.3 From 0bda6dcd6012fb15734d844e3e574a49f2361390 Mon Sep 17 00:00:00 2001 From: Kathy Gray Date: Wed, 18 Nov 2015 15:21:39 +0000 Subject: Update makefile for elf --- src/Makefile | 39 +++++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index f9fb9f5c..a8b6f773 100644 --- a/src/Makefile +++ b/src/Makefile @@ -14,7 +14,9 @@ interpreter: elf: ocamlbuild -use-ocamlfind -pkgs batteries,uint,unix,zarith src_elf/main_elf.native ocamlbuild -use-ocamlfind -pkgs batteries,uint,unix,zarith src_elf/abis/power64/abi_power64.cmxa + ocamlbuild -use-ocamlfind -pkgs batteries,uint,unix,zarith src_elf/abis/power64/abi_power64.cma ocamlbuild -use-ocamlfind -pkgs batteries,uint,unix,zarith src_elf/abis/aarch64/abi_aarch64_le.cmxa + ocamlbuild -use-ocamlfind -pkgs batteries,uint,unix,zarith src_elf/abis/aarch64/abi_aarch64_le.cma test: sail interpreter ocamlbuild test/run_tests.native @@ -23,10 +25,39 @@ test: sail interpreter LEM = ~/bitbucket/lem/lem LEMLIBOCAML = ~/bitbucket/lem/ocaml-lib/ -install_elf: - cp -p ../../system-v-abi/src/*.lem elf_model/ - cp -p ../../system-v-abi/src/*.ml elf_model/ - cp -p -r ../../system-v-abi/src/libraries elf_model/libraries +ELF_DIR= ../../../bitbucket/linksem + +get_elf: + -chmod u+w src_elf/*.ml* + -chmod u+w src_elf/abis/*.ml* + -chmod u+w src_elf/abis/amd64/*.ml* + -chmod u+w src_elf/abis/power64/*.ml* + -chmod u+w src_elf/abis/aarch64/*.ml* + -chmod u+w src_elf/adaptors/*.ml* + -chmod u+w src_elf/gnu_extensions/*.ml* + rm -rf src_elf/*.ml* + rm -rf src_elf/abis/*.ml* + rm -rf src_elf/abis/amd64/*.ml* + rm -rf src_elf/abis/power64/*.ml* + rm -rf src_elf/abis/aarch64/*.ml* + rm -rf src_elf/adaptors/*.ml* + rm -rf src_elf/gnu_extensions/*.ml* + $(MAKE) -C $(ELFDIR)/src clean + $(MAKE) -C $(ELFDIR)/src lem-all-ocaml + cp -a $(ELFDIR)/src/*.ml src_elf + cp -a $(ELFDIR)/src/abis/*.ml src_elf/abis + cp -a $(ELFDIR)/src/abis/amd64/*.ml src_elf/abis/amd64 + cp -a $(ELFDIR)/src/abis/power64/*.ml src_elf/abis/power64 + cp -a $(ELFDIR)/src/abis/aarch64/*.ml src_elf/abis/aarch64 + cp -a $(ELFDIR)/src/adaptors/*.ml src_elf/adaptors + cp -a $(ELFDIR)/src/gnu_extensions/*.ml* + chmod ugo-w src_elf/*.ml* + chmod ugo-w src_elf/abis/*.ml* + chmod ugo-w src_elf/abis/amd64/*.ml* + chmod ugo-w src_elf/abis/power64/*.ml* + chmod ugo-w src_elf/abis/aarch64/*.ml* + chmod ugo-w src_elf/adaptors/*.ml* + chmod ugo-w src_elf/gnu_extensions/*.ml* power: sail interpreter elf -- cgit v1.2.3 From c8a5014d070a126091da28da04f43cc4c54acf87 Mon Sep 17 00:00:00 2001 From: Kathy Gray Date: Thu, 19 Nov 2015 11:07:30 +0000 Subject: typo in make file --- src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index a8b6f773..e2f063a2 100644 --- a/src/Makefile +++ b/src/Makefile @@ -25,7 +25,7 @@ test: sail interpreter LEM = ~/bitbucket/lem/lem LEMLIBOCAML = ~/bitbucket/lem/ocaml-lib/ -ELF_DIR= ../../../bitbucket/linksem +ELFDIR= ../../../bitbucket/linksem get_elf: -chmod u+w src_elf/*.ml* -- cgit v1.2.3 From 3581115b3f458082c74bcab4926bebdb31d0dd73 Mon Sep 17 00:00:00 2001 From: Kathy Gray Date: Thu, 19 Nov 2015 11:15:16 +0000 Subject: More makefile type --- src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index e2f063a2..09dfabc8 100644 --- a/src/Makefile +++ b/src/Makefile @@ -50,7 +50,7 @@ get_elf: cp -a $(ELFDIR)/src/abis/power64/*.ml src_elf/abis/power64 cp -a $(ELFDIR)/src/abis/aarch64/*.ml src_elf/abis/aarch64 cp -a $(ELFDIR)/src/adaptors/*.ml src_elf/adaptors - cp -a $(ELFDIR)/src/gnu_extensions/*.ml* + cp -a $(ELFDIR)/src/gnu_extensions/*.ml* src_elf/gnu_extensions chmod ugo-w src_elf/*.ml* chmod ugo-w src_elf/abis/*.ml* chmod ugo-w src_elf/abis/amd64/*.ml* -- cgit v1.2.3 From e6ca8bd198899ae5ede8f00d9e5c138559fc895b Mon Sep 17 00:00:00 2001 From: Kathy Gray Date: Thu, 19 Nov 2015 11:22:44 +0000 Subject: Keep up with linksem --- src/Makefile | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index 09dfabc8..4016a07b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -33,6 +33,7 @@ get_elf: -chmod u+w src_elf/abis/amd64/*.ml* -chmod u+w src_elf/abis/power64/*.ml* -chmod u+w src_elf/abis/aarch64/*.ml* + -chmod u+w src_elf/abis/x86/*.ml* -chmod u+w src_elf/adaptors/*.ml* -chmod u+w src_elf/gnu_extensions/*.ml* rm -rf src_elf/*.ml* @@ -40,6 +41,7 @@ get_elf: rm -rf src_elf/abis/amd64/*.ml* rm -rf src_elf/abis/power64/*.ml* rm -rf src_elf/abis/aarch64/*.ml* + rm -rf src_elf/abis/x86/*.ml* rm -rf src_elf/adaptors/*.ml* rm -rf src_elf/gnu_extensions/*.ml* $(MAKE) -C $(ELFDIR)/src clean @@ -49,6 +51,7 @@ get_elf: cp -a $(ELFDIR)/src/abis/amd64/*.ml src_elf/abis/amd64 cp -a $(ELFDIR)/src/abis/power64/*.ml src_elf/abis/power64 cp -a $(ELFDIR)/src/abis/aarch64/*.ml src_elf/abis/aarch64 + cp -a $(ELFDIR)/src/abis/x86/*.ml src_elf/abis/x86 cp -a $(ELFDIR)/src/adaptors/*.ml src_elf/adaptors cp -a $(ELFDIR)/src/gnu_extensions/*.ml* src_elf/gnu_extensions chmod ugo-w src_elf/*.ml* @@ -56,6 +59,7 @@ get_elf: chmod ugo-w src_elf/abis/amd64/*.ml* chmod ugo-w src_elf/abis/power64/*.ml* chmod ugo-w src_elf/abis/aarch64/*.ml* + chmod ugo-w src_elf/abis/x86/*.ml* chmod ugo-w src_elf/adaptors/*.ml* chmod ugo-w src_elf/gnu_extensions/*.ml* -- cgit v1.2.3