diff options
author | Andy Wingo <wingo@pobox.com> | 2019-04-03 13:59:33 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2019-04-03 13:59:33 +0200 |
commit | 2e4fb1e665562bfd84a0d35c965ce0c29a0abc9d (patch) | |
tree | 1ef4036a23def6de8df188e477ca6e1bc19d055d | |
parent | d351f13bc2eedff7a35f3bd479390bd269f96bbd (diff) | |
parent | f348b8ed6d44a90a199fca9debb43971b23d0017 (diff) | |
download | guile-2e4fb1e665562bfd84a0d35c965ce0c29a0abc9d.tar.gz |
Merge in changes from upstream lightening
-rw-r--r-- | libguile/lightning/README.md | 4 | ||||
-rw-r--r-- | libguile/lightning/lightening.h (renamed from libguile/lightning/jit.h) | 22 | ||||
-rw-r--r-- | libguile/lightning/lightening/aarch64-cpu.c (renamed from libguile/lightning/jit/aarch64-cpu.c) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/aarch64-fpu.c (renamed from libguile/lightning/jit/aarch64-fpu.c) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/aarch64.c (renamed from libguile/lightning/jit/aarch64.c) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/aarch64.h (renamed from libguile/lightning/jit/aarch64.h) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/alpha-cpu.c (renamed from libguile/lightning/jit/alpha-cpu.c) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/alpha-fpu.c (renamed from libguile/lightning/jit/alpha-fpu.c) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/alpha.c (renamed from libguile/lightning/jit/alpha.c) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/alpha.h (renamed from libguile/lightning/jit/alpha.h) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/arm-cpu.c (renamed from libguile/lightning/jit/arm-cpu.c) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/arm-swf.c (renamed from libguile/lightning/jit/arm-swf.c) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/arm-vfp.c (renamed from libguile/lightning/jit/arm-vfp.c) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/arm.c (renamed from libguile/lightning/jit/arm.c) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/arm.h (renamed from libguile/lightning/jit/arm.h) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/endian.h (renamed from libguile/lightning/jit/endian.h) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/hppa-cpu.c (renamed from libguile/lightning/jit/hppa-cpu.c) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/hppa-fpu.c (renamed from libguile/lightning/jit/hppa-fpu.c) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/hppa.c (renamed from libguile/lightning/jit/hppa.c) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/hppa.h (renamed from libguile/lightning/jit/hppa.h) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/ia64-cpu.c (renamed from libguile/lightning/jit/ia64-cpu.c) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/ia64-fpu.c (renamed from libguile/lightning/jit/ia64-fpu.c) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/ia64.c (renamed from libguile/lightning/jit/ia64.c) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/ia64.h (renamed from libguile/lightning/jit/ia64.h) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/lightening.c (renamed from libguile/lightning/jit/jit.c) | 2 | ||||
-rw-r--r-- | libguile/lightning/lightening/mips-cpu.c (renamed from libguile/lightning/jit/mips-cpu.c) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/mips-fpu.c (renamed from libguile/lightning/jit/mips-fpu.c) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/mips.c (renamed from libguile/lightning/jit/mips.c) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/mips.h (renamed from libguile/lightning/jit/mips.h) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/ppc-cpu.c (renamed from libguile/lightning/jit/ppc-cpu.c) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/ppc-fpu.c (renamed from libguile/lightning/jit/ppc-fpu.c) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/ppc.c (renamed from libguile/lightning/jit/ppc.c) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/ppc.h (renamed from libguile/lightning/jit/ppc.h) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/s390-cpu.c (renamed from libguile/lightning/jit/s390-cpu.c) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/s390-fpu.c (renamed from libguile/lightning/jit/s390-fpu.c) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/s390.c (renamed from libguile/lightning/jit/s390.c) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/s390.h (renamed from libguile/lightning/jit/s390.h) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/sparc-cpu.c (renamed from libguile/lightning/jit/sparc-cpu.c) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/sparc-fpu.c (renamed from libguile/lightning/jit/sparc-fpu.c) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/sparc.c (renamed from libguile/lightning/jit/sparc.c) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/sparc.h (renamed from libguile/lightning/jit/sparc.h) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/x86-cpu.c (renamed from libguile/lightning/jit/x86-cpu.c) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/x86-sse.c (renamed from libguile/lightning/jit/x86-sse.c) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/x86-x87.c (renamed from libguile/lightning/jit/x86-x87.c) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/x86.c (renamed from libguile/lightning/jit/x86.c) | 0 | ||||
-rw-r--r-- | libguile/lightning/lightening/x86.h (renamed from libguile/lightning/jit/x86.h) | 0 | ||||
-rw-r--r-- | libguile/lightning/tests/Makefile | 10 | ||||
-rw-r--r-- | libguile/lightning/tests/test.h | 2 |
48 files changed, 20 insertions, 20 deletions
diff --git a/libguile/lightning/README.md b/libguile/lightning/README.md index 90e01bf3f..7eb499435 100644 --- a/libguile/lightning/README.md +++ b/libguile/lightning/README.md @@ -6,8 +6,8 @@ Lightning, adapted to the purposes of the GNU Guile project. ## Use ``` -gcc -flto -O2 -g -o jit.o -c jit/jit.c -gcc -flto -O2 -g -o my-program jit.o my-program.c +gcc -flto -O2 -g -o lightening.o -c lightening/lightening.c +gcc -flto -O2 -g -o my-program lightening.o my-program.c ``` See the GNU Lightning manual for more on how to program against diff --git a/libguile/lightning/jit.h b/libguile/lightning/lightening.h index 67e107497..da1d4ec68 100644 --- a/libguile/lightning/jit.h +++ b/libguile/lightning/lightening.h @@ -27,7 +27,7 @@ #include <string.h> #include <stddef.h> -#include "jit/endian.h" +#include "lightening/endian.h" CHOOSE_32_64(typedef int32_t jit_word_t, typedef int64_t jit_word_t); @@ -74,25 +74,25 @@ typedef struct jit_reloc #endif #if defined(__i386__) || defined(__x86_64__) -# include "jit/x86.h" +# include "lightening/x86.h" #elif defined(__mips__) -# include "jit/mips.h" +# include "lightening/mips.h" #elif defined(__arm__) -# include "jit/arm.h" +# include "lightening/arm.h" #elif defined(__ppc__) || defined(__powerpc__) -# include "jit/ppc.h" +# include "lightening/ppc.h" #elif defined(__sparc__) -# include "jit/sparc.h" +# include "lightening/sparc.h" #elif defined(__ia64__) -# include "jit/ia64.h" +# include "lightening/ia64.h" #elif defined(__hppa__) -# include "jit/hppa.h" +# include "lightening/hppa.h" #elif defined(__aarch64__) -# include "jit/aarch64.h" +# include "lightening/aarch64.h" #elif defined(__s390__) || defined(__s390x__) -# include "jit/s390.h" +# include "lightening/s390.h" #elif defined(__alpha__) -# include "jit/alpha.h" +# include "lightening/alpha.h" #endif #define JIT_R(index) JIT_GPR(jit_r(index)) diff --git a/libguile/lightning/jit/aarch64-cpu.c b/libguile/lightning/lightening/aarch64-cpu.c index 98f2dabde..98f2dabde 100644 --- a/libguile/lightning/jit/aarch64-cpu.c +++ b/libguile/lightning/lightening/aarch64-cpu.c diff --git a/libguile/lightning/jit/aarch64-fpu.c b/libguile/lightning/lightening/aarch64-fpu.c index e1ccde65c..e1ccde65c 100644 --- a/libguile/lightning/jit/aarch64-fpu.c +++ b/libguile/lightning/lightening/aarch64-fpu.c diff --git a/libguile/lightning/jit/aarch64.c b/libguile/lightning/lightening/aarch64.c index 332c4c0c6..332c4c0c6 100644 --- a/libguile/lightning/jit/aarch64.c +++ b/libguile/lightning/lightening/aarch64.c diff --git a/libguile/lightning/jit/aarch64.h b/libguile/lightning/lightening/aarch64.h index 65723a6d2..65723a6d2 100644 --- a/libguile/lightning/jit/aarch64.h +++ b/libguile/lightning/lightening/aarch64.h diff --git a/libguile/lightning/jit/alpha-cpu.c b/libguile/lightning/lightening/alpha-cpu.c index a31640f37..a31640f37 100644 --- a/libguile/lightning/jit/alpha-cpu.c +++ b/libguile/lightning/lightening/alpha-cpu.c diff --git a/libguile/lightning/jit/alpha-fpu.c b/libguile/lightning/lightening/alpha-fpu.c index b3d65af85..b3d65af85 100644 --- a/libguile/lightning/jit/alpha-fpu.c +++ b/libguile/lightning/lightening/alpha-fpu.c diff --git a/libguile/lightning/jit/alpha.c b/libguile/lightning/lightening/alpha.c index 1f1e40634..1f1e40634 100644 --- a/libguile/lightning/jit/alpha.c +++ b/libguile/lightning/lightening/alpha.c diff --git a/libguile/lightning/jit/alpha.h b/libguile/lightning/lightening/alpha.h index 8ccb5cc8a..8ccb5cc8a 100644 --- a/libguile/lightning/jit/alpha.h +++ b/libguile/lightning/lightening/alpha.h diff --git a/libguile/lightning/jit/arm-cpu.c b/libguile/lightning/lightening/arm-cpu.c index 9d44699b9..9d44699b9 100644 --- a/libguile/lightning/jit/arm-cpu.c +++ b/libguile/lightning/lightening/arm-cpu.c diff --git a/libguile/lightning/jit/arm-swf.c b/libguile/lightning/lightening/arm-swf.c index 2b8bfa139..2b8bfa139 100644 --- a/libguile/lightning/jit/arm-swf.c +++ b/libguile/lightning/lightening/arm-swf.c diff --git a/libguile/lightning/jit/arm-vfp.c b/libguile/lightning/lightening/arm-vfp.c index d17a77844..d17a77844 100644 --- a/libguile/lightning/jit/arm-vfp.c +++ b/libguile/lightning/lightening/arm-vfp.c diff --git a/libguile/lightning/jit/arm.c b/libguile/lightning/lightening/arm.c index ef4a3e2e7..ef4a3e2e7 100644 --- a/libguile/lightning/jit/arm.c +++ b/libguile/lightning/lightening/arm.c diff --git a/libguile/lightning/jit/arm.h b/libguile/lightning/lightening/arm.h index 9177f1354..9177f1354 100644 --- a/libguile/lightning/jit/arm.h +++ b/libguile/lightning/lightening/arm.h diff --git a/libguile/lightning/jit/endian.h b/libguile/lightning/lightening/endian.h index b9b1a918d..b9b1a918d 100644 --- a/libguile/lightning/jit/endian.h +++ b/libguile/lightning/lightening/endian.h diff --git a/libguile/lightning/jit/hppa-cpu.c b/libguile/lightning/lightening/hppa-cpu.c index 68281e4a5..68281e4a5 100644 --- a/libguile/lightning/jit/hppa-cpu.c +++ b/libguile/lightning/lightening/hppa-cpu.c diff --git a/libguile/lightning/jit/hppa-fpu.c b/libguile/lightning/lightening/hppa-fpu.c index 98c39ce5c..98c39ce5c 100644 --- a/libguile/lightning/jit/hppa-fpu.c +++ b/libguile/lightning/lightening/hppa-fpu.c diff --git a/libguile/lightning/jit/hppa.c b/libguile/lightning/lightening/hppa.c index 38c75e0ca..38c75e0ca 100644 --- a/libguile/lightning/jit/hppa.c +++ b/libguile/lightning/lightening/hppa.c diff --git a/libguile/lightning/jit/hppa.h b/libguile/lightning/lightening/hppa.h index b26e4bd68..b26e4bd68 100644 --- a/libguile/lightning/jit/hppa.h +++ b/libguile/lightning/lightening/hppa.h diff --git a/libguile/lightning/jit/ia64-cpu.c b/libguile/lightning/lightening/ia64-cpu.c index 160f640bb..160f640bb 100644 --- a/libguile/lightning/jit/ia64-cpu.c +++ b/libguile/lightning/lightening/ia64-cpu.c diff --git a/libguile/lightning/jit/ia64-fpu.c b/libguile/lightning/lightening/ia64-fpu.c index 9c3146ffe..9c3146ffe 100644 --- a/libguile/lightning/jit/ia64-fpu.c +++ b/libguile/lightning/lightening/ia64-fpu.c diff --git a/libguile/lightning/jit/ia64.c b/libguile/lightning/lightening/ia64.c index 185d41cbf..185d41cbf 100644 --- a/libguile/lightning/jit/ia64.c +++ b/libguile/lightning/lightening/ia64.c diff --git a/libguile/lightning/jit/ia64.h b/libguile/lightning/lightening/ia64.h index 4723e70ce..4723e70ce 100644 --- a/libguile/lightning/jit/ia64.h +++ b/libguile/lightning/lightening/ia64.h diff --git a/libguile/lightning/jit/jit.c b/libguile/lightning/lightening/lightening.c index 666b1dfec..afb0b11ee 100644 --- a/libguile/lightning/jit/jit.c +++ b/libguile/lightning/lightening/lightening.c @@ -27,7 +27,7 @@ #include <stdio.h> #include <sys/mman.h> -#include "../jit.h" +#include "../lightening.h" #if defined(__GNUC__) # define maybe_unused __attribute__ ((unused)) diff --git a/libguile/lightning/jit/mips-cpu.c b/libguile/lightning/lightening/mips-cpu.c index 7ab58b873..7ab58b873 100644 --- a/libguile/lightning/jit/mips-cpu.c +++ b/libguile/lightning/lightening/mips-cpu.c diff --git a/libguile/lightning/jit/mips-fpu.c b/libguile/lightning/lightening/mips-fpu.c index cc9be6c66..cc9be6c66 100644 --- a/libguile/lightning/jit/mips-fpu.c +++ b/libguile/lightning/lightening/mips-fpu.c diff --git a/libguile/lightning/jit/mips.c b/libguile/lightning/lightening/mips.c index 70b2d94ea..70b2d94ea 100644 --- a/libguile/lightning/jit/mips.c +++ b/libguile/lightning/lightening/mips.c diff --git a/libguile/lightning/jit/mips.h b/libguile/lightning/lightening/mips.h index e669966aa..e669966aa 100644 --- a/libguile/lightning/jit/mips.h +++ b/libguile/lightning/lightening/mips.h diff --git a/libguile/lightning/jit/ppc-cpu.c b/libguile/lightning/lightening/ppc-cpu.c index 6f911dd1f..6f911dd1f 100644 --- a/libguile/lightning/jit/ppc-cpu.c +++ b/libguile/lightning/lightening/ppc-cpu.c diff --git a/libguile/lightning/jit/ppc-fpu.c b/libguile/lightning/lightening/ppc-fpu.c index da7ac0cbe..da7ac0cbe 100644 --- a/libguile/lightning/jit/ppc-fpu.c +++ b/libguile/lightning/lightening/ppc-fpu.c diff --git a/libguile/lightning/jit/ppc.c b/libguile/lightning/lightening/ppc.c index a6502cbac..a6502cbac 100644 --- a/libguile/lightning/jit/ppc.c +++ b/libguile/lightning/lightening/ppc.c diff --git a/libguile/lightning/jit/ppc.h b/libguile/lightning/lightening/ppc.h index 72b33bdd8..72b33bdd8 100644 --- a/libguile/lightning/jit/ppc.h +++ b/libguile/lightning/lightening/ppc.h diff --git a/libguile/lightning/jit/s390-cpu.c b/libguile/lightning/lightening/s390-cpu.c index 02f2675ec..02f2675ec 100644 --- a/libguile/lightning/jit/s390-cpu.c +++ b/libguile/lightning/lightening/s390-cpu.c diff --git a/libguile/lightning/jit/s390-fpu.c b/libguile/lightning/lightening/s390-fpu.c index 386664369..386664369 100644 --- a/libguile/lightning/jit/s390-fpu.c +++ b/libguile/lightning/lightening/s390-fpu.c diff --git a/libguile/lightning/jit/s390.c b/libguile/lightning/lightening/s390.c index 0dc109a9f..0dc109a9f 100644 --- a/libguile/lightning/jit/s390.c +++ b/libguile/lightning/lightening/s390.c diff --git a/libguile/lightning/jit/s390.h b/libguile/lightning/lightening/s390.h index 0e74b2e25..0e74b2e25 100644 --- a/libguile/lightning/jit/s390.h +++ b/libguile/lightning/lightening/s390.h diff --git a/libguile/lightning/jit/sparc-cpu.c b/libguile/lightning/lightening/sparc-cpu.c index 81f92ce23..81f92ce23 100644 --- a/libguile/lightning/jit/sparc-cpu.c +++ b/libguile/lightning/lightening/sparc-cpu.c diff --git a/libguile/lightning/jit/sparc-fpu.c b/libguile/lightning/lightening/sparc-fpu.c index 3305b4deb..3305b4deb 100644 --- a/libguile/lightning/jit/sparc-fpu.c +++ b/libguile/lightning/lightening/sparc-fpu.c diff --git a/libguile/lightning/jit/sparc.c b/libguile/lightning/lightening/sparc.c index 10aac8528..10aac8528 100644 --- a/libguile/lightning/jit/sparc.c +++ b/libguile/lightning/lightening/sparc.c diff --git a/libguile/lightning/jit/sparc.h b/libguile/lightning/lightening/sparc.h index f74f5ff30..f74f5ff30 100644 --- a/libguile/lightning/jit/sparc.h +++ b/libguile/lightning/lightening/sparc.h diff --git a/libguile/lightning/jit/x86-cpu.c b/libguile/lightning/lightening/x86-cpu.c index 1c1da2b4f..1c1da2b4f 100644 --- a/libguile/lightning/jit/x86-cpu.c +++ b/libguile/lightning/lightening/x86-cpu.c diff --git a/libguile/lightning/jit/x86-sse.c b/libguile/lightning/lightening/x86-sse.c index 44d990545..44d990545 100644 --- a/libguile/lightning/jit/x86-sse.c +++ b/libguile/lightning/lightening/x86-sse.c diff --git a/libguile/lightning/jit/x86-x87.c b/libguile/lightning/lightening/x86-x87.c index e6f8be5f4..e6f8be5f4 100644 --- a/libguile/lightning/jit/x86-x87.c +++ b/libguile/lightning/lightening/x86-x87.c diff --git a/libguile/lightning/jit/x86.c b/libguile/lightning/lightening/x86.c index 16bb5187a..16bb5187a 100644 --- a/libguile/lightning/jit/x86.c +++ b/libguile/lightning/lightening/x86.c diff --git a/libguile/lightning/jit/x86.h b/libguile/lightning/lightening/x86.h index b275e5e8b..b275e5e8b 100644 --- a/libguile/lightning/jit/x86.h +++ b/libguile/lightning/lightening/x86.h diff --git a/libguile/lightning/tests/Makefile b/libguile/lightning/tests/Makefile index d5295ac13..e94c6fdee 100644 --- a/libguile/lightning/tests/Makefile +++ b/libguile/lightning/tests/Makefile @@ -13,12 +13,12 @@ check: all done @echo "Success." -jit.o: ../jit.h ../jit/*.c - $(CC) $(CFLAGS) $(CPPFLAGS) -I.. -o jit.o -c ../jit/jit.c +lightening.o: ../lightening.h ../lightening/*.c + $(CC) $(CFLAGS) $(CPPFLAGS) -I.. -o lightening.o -c ../lightening/lightening.c -test-%: %.c jit.o test.h - $(CC) $(CFLAGS) $(CPPFLAGS) -I.. -o $@ jit.o $< +test-%: %.c lightening.o test.h + $(CC) $(CFLAGS) $(CPPFLAGS) -I.. -o $@ lightening.o $< clean: rm -f $(addprefix test-,$(TESTS)) - rm -f jit.o + rm -f lightening.o diff --git a/libguile/lightning/tests/test.h b/libguile/lightning/tests/test.h index bc30507ca..d2d7ec72d 100644 --- a/libguile/lightning/tests/test.h +++ b/libguile/lightning/tests/test.h @@ -2,7 +2,7 @@ #include <stdlib.h> #include <sys/mman.h> -#include <jit.h> +#include <lightening.h> #define ASSERT(x) \ do { \ |