From f348b8ed6d44a90a199fca9debb43971b23d0017 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Wed, 3 Apr 2019 13:57:48 +0200 Subject: [PATCH] Change headers and files to be named "lightening" instead of "jit" This improves integration with other projects. Like for example Guile already has files named jit.c and jit.h; it's easier to manage if lightening uses its own file names. --- README.md | 4 ++-- jit.h => lightening.h | 22 +++++++++++----------- {jit => lightening}/aarch64-cpu.c | 0 {jit => lightening}/aarch64-fpu.c | 0 {jit => lightening}/aarch64.c | 0 {jit => lightening}/aarch64.h | 0 {jit => lightening}/alpha-cpu.c | 0 {jit => lightening}/alpha-fpu.c | 0 {jit => lightening}/alpha.c | 0 {jit => lightening}/alpha.h | 0 {jit => lightening}/arm-cpu.c | 0 {jit => lightening}/arm-swf.c | 0 {jit => lightening}/arm-vfp.c | 0 {jit => lightening}/arm.c | 0 {jit => lightening}/arm.h | 0 {jit => lightening}/endian.h | 0 {jit => lightening}/hppa-cpu.c | 0 {jit => lightening}/hppa-fpu.c | 0 {jit => lightening}/hppa.c | 0 {jit => lightening}/hppa.h | 0 {jit => lightening}/ia64-cpu.c | 0 {jit => lightening}/ia64-fpu.c | 0 {jit => lightening}/ia64.c | 0 {jit => lightening}/ia64.h | 0 jit/jit.c => lightening/lightening.c | 2 +- {jit => lightening}/mips-cpu.c | 0 {jit => lightening}/mips-fpu.c | 0 {jit => lightening}/mips.c | 0 {jit => lightening}/mips.h | 0 {jit => lightening}/ppc-cpu.c | 0 {jit => lightening}/ppc-fpu.c | 0 {jit => lightening}/ppc.c | 0 {jit => lightening}/ppc.h | 0 {jit => lightening}/s390-cpu.c | 0 {jit => lightening}/s390-fpu.c | 0 {jit => lightening}/s390.c | 0 {jit => lightening}/s390.h | 0 {jit => lightening}/sparc-cpu.c | 0 {jit => lightening}/sparc-fpu.c | 0 {jit => lightening}/sparc.c | 0 {jit => lightening}/sparc.h | 0 {jit => lightening}/x86-cpu.c | 0 {jit => lightening}/x86-sse.c | 0 {jit => lightening}/x86-x87.c | 0 {jit => lightening}/x86.c | 0 {jit => lightening}/x86.h | 0 tests/Makefile | 10 +++++----- tests/test.h | 2 +- 48 files changed, 20 insertions(+), 20 deletions(-) rename jit.h => lightening.h (97%) rename {jit => lightening}/aarch64-cpu.c (100%) rename {jit => lightening}/aarch64-fpu.c (100%) rename {jit => lightening}/aarch64.c (100%) rename {jit => lightening}/aarch64.h (100%) rename {jit => lightening}/alpha-cpu.c (100%) rename {jit => lightening}/alpha-fpu.c (100%) rename {jit => lightening}/alpha.c (100%) rename {jit => lightening}/alpha.h (100%) rename {jit => lightening}/arm-cpu.c (100%) rename {jit => lightening}/arm-swf.c (100%) rename {jit => lightening}/arm-vfp.c (100%) rename {jit => lightening}/arm.c (100%) rename {jit => lightening}/arm.h (100%) rename {jit => lightening}/endian.h (100%) rename {jit => lightening}/hppa-cpu.c (100%) rename {jit => lightening}/hppa-fpu.c (100%) rename {jit => lightening}/hppa.c (100%) rename {jit => lightening}/hppa.h (100%) rename {jit => lightening}/ia64-cpu.c (100%) rename {jit => lightening}/ia64-fpu.c (100%) rename {jit => lightening}/ia64.c (100%) rename {jit => lightening}/ia64.h (100%) rename jit/jit.c => lightening/lightening.c (99%) rename {jit => lightening}/mips-cpu.c (100%) rename {jit => lightening}/mips-fpu.c (100%) rename {jit => lightening}/mips.c (100%) rename {jit => lightening}/mips.h (100%) rename {jit => lightening}/ppc-cpu.c (100%) rename {jit => lightening}/ppc-fpu.c (100%) rename {jit => lightening}/ppc.c (100%) rename {jit => lightening}/ppc.h (100%) rename {jit => lightening}/s390-cpu.c (100%) rename {jit => lightening}/s390-fpu.c (100%) rename {jit => lightening}/s390.c (100%) rename {jit => lightening}/s390.h (100%) rename {jit => lightening}/sparc-cpu.c (100%) rename {jit => lightening}/sparc-fpu.c (100%) rename {jit => lightening}/sparc.c (100%) rename {jit => lightening}/sparc.h (100%) rename {jit => lightening}/x86-cpu.c (100%) rename {jit => lightening}/x86-sse.c (100%) rename {jit => lightening}/x86-x87.c (100%) rename {jit => lightening}/x86.c (100%) rename {jit => lightening}/x86.h (100%) diff --git a/README.md b/README.md index 90e01bf3f..7eb499435 100644 --- a/README.md +++ b/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/jit.h b/lightening.h similarity index 97% rename from jit.h rename to lightening.h index 67e107497..da1d4ec68 100644 --- a/jit.h +++ b/lightening.h @@ -27,7 +27,7 @@ #include #include -#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/jit/aarch64-cpu.c b/lightening/aarch64-cpu.c similarity index 100% rename from jit/aarch64-cpu.c rename to lightening/aarch64-cpu.c diff --git a/jit/aarch64-fpu.c b/lightening/aarch64-fpu.c similarity index 100% rename from jit/aarch64-fpu.c rename to lightening/aarch64-fpu.c diff --git a/jit/aarch64.c b/lightening/aarch64.c similarity index 100% rename from jit/aarch64.c rename to lightening/aarch64.c diff --git a/jit/aarch64.h b/lightening/aarch64.h similarity index 100% rename from jit/aarch64.h rename to lightening/aarch64.h diff --git a/jit/alpha-cpu.c b/lightening/alpha-cpu.c similarity index 100% rename from jit/alpha-cpu.c rename to lightening/alpha-cpu.c diff --git a/jit/alpha-fpu.c b/lightening/alpha-fpu.c similarity index 100% rename from jit/alpha-fpu.c rename to lightening/alpha-fpu.c diff --git a/jit/alpha.c b/lightening/alpha.c similarity index 100% rename from jit/alpha.c rename to lightening/alpha.c diff --git a/jit/alpha.h b/lightening/alpha.h similarity index 100% rename from jit/alpha.h rename to lightening/alpha.h diff --git a/jit/arm-cpu.c b/lightening/arm-cpu.c similarity index 100% rename from jit/arm-cpu.c rename to lightening/arm-cpu.c diff --git a/jit/arm-swf.c b/lightening/arm-swf.c similarity index 100% rename from jit/arm-swf.c rename to lightening/arm-swf.c diff --git a/jit/arm-vfp.c b/lightening/arm-vfp.c similarity index 100% rename from jit/arm-vfp.c rename to lightening/arm-vfp.c diff --git a/jit/arm.c b/lightening/arm.c similarity index 100% rename from jit/arm.c rename to lightening/arm.c diff --git a/jit/arm.h b/lightening/arm.h similarity index 100% rename from jit/arm.h rename to lightening/arm.h diff --git a/jit/endian.h b/lightening/endian.h similarity index 100% rename from jit/endian.h rename to lightening/endian.h diff --git a/jit/hppa-cpu.c b/lightening/hppa-cpu.c similarity index 100% rename from jit/hppa-cpu.c rename to lightening/hppa-cpu.c diff --git a/jit/hppa-fpu.c b/lightening/hppa-fpu.c similarity index 100% rename from jit/hppa-fpu.c rename to lightening/hppa-fpu.c diff --git a/jit/hppa.c b/lightening/hppa.c similarity index 100% rename from jit/hppa.c rename to lightening/hppa.c diff --git a/jit/hppa.h b/lightening/hppa.h similarity index 100% rename from jit/hppa.h rename to lightening/hppa.h diff --git a/jit/ia64-cpu.c b/lightening/ia64-cpu.c similarity index 100% rename from jit/ia64-cpu.c rename to lightening/ia64-cpu.c diff --git a/jit/ia64-fpu.c b/lightening/ia64-fpu.c similarity index 100% rename from jit/ia64-fpu.c rename to lightening/ia64-fpu.c diff --git a/jit/ia64.c b/lightening/ia64.c similarity index 100% rename from jit/ia64.c rename to lightening/ia64.c diff --git a/jit/ia64.h b/lightening/ia64.h similarity index 100% rename from jit/ia64.h rename to lightening/ia64.h diff --git a/jit/jit.c b/lightening/lightening.c similarity index 99% rename from jit/jit.c rename to lightening/lightening.c index 666b1dfec..afb0b11ee 100644 --- a/jit/jit.c +++ b/lightening/lightening.c @@ -27,7 +27,7 @@ #include #include -#include "../jit.h" +#include "../lightening.h" #if defined(__GNUC__) # define maybe_unused __attribute__ ((unused)) diff --git a/jit/mips-cpu.c b/lightening/mips-cpu.c similarity index 100% rename from jit/mips-cpu.c rename to lightening/mips-cpu.c diff --git a/jit/mips-fpu.c b/lightening/mips-fpu.c similarity index 100% rename from jit/mips-fpu.c rename to lightening/mips-fpu.c diff --git a/jit/mips.c b/lightening/mips.c similarity index 100% rename from jit/mips.c rename to lightening/mips.c diff --git a/jit/mips.h b/lightening/mips.h similarity index 100% rename from jit/mips.h rename to lightening/mips.h diff --git a/jit/ppc-cpu.c b/lightening/ppc-cpu.c similarity index 100% rename from jit/ppc-cpu.c rename to lightening/ppc-cpu.c diff --git a/jit/ppc-fpu.c b/lightening/ppc-fpu.c similarity index 100% rename from jit/ppc-fpu.c rename to lightening/ppc-fpu.c diff --git a/jit/ppc.c b/lightening/ppc.c similarity index 100% rename from jit/ppc.c rename to lightening/ppc.c diff --git a/jit/ppc.h b/lightening/ppc.h similarity index 100% rename from jit/ppc.h rename to lightening/ppc.h diff --git a/jit/s390-cpu.c b/lightening/s390-cpu.c similarity index 100% rename from jit/s390-cpu.c rename to lightening/s390-cpu.c diff --git a/jit/s390-fpu.c b/lightening/s390-fpu.c similarity index 100% rename from jit/s390-fpu.c rename to lightening/s390-fpu.c diff --git a/jit/s390.c b/lightening/s390.c similarity index 100% rename from jit/s390.c rename to lightening/s390.c diff --git a/jit/s390.h b/lightening/s390.h similarity index 100% rename from jit/s390.h rename to lightening/s390.h diff --git a/jit/sparc-cpu.c b/lightening/sparc-cpu.c similarity index 100% rename from jit/sparc-cpu.c rename to lightening/sparc-cpu.c diff --git a/jit/sparc-fpu.c b/lightening/sparc-fpu.c similarity index 100% rename from jit/sparc-fpu.c rename to lightening/sparc-fpu.c diff --git a/jit/sparc.c b/lightening/sparc.c similarity index 100% rename from jit/sparc.c rename to lightening/sparc.c diff --git a/jit/sparc.h b/lightening/sparc.h similarity index 100% rename from jit/sparc.h rename to lightening/sparc.h diff --git a/jit/x86-cpu.c b/lightening/x86-cpu.c similarity index 100% rename from jit/x86-cpu.c rename to lightening/x86-cpu.c diff --git a/jit/x86-sse.c b/lightening/x86-sse.c similarity index 100% rename from jit/x86-sse.c rename to lightening/x86-sse.c diff --git a/jit/x86-x87.c b/lightening/x86-x87.c similarity index 100% rename from jit/x86-x87.c rename to lightening/x86-x87.c diff --git a/jit/x86.c b/lightening/x86.c similarity index 100% rename from jit/x86.c rename to lightening/x86.c diff --git a/jit/x86.h b/lightening/x86.h similarity index 100% rename from jit/x86.h rename to lightening/x86.h diff --git a/tests/Makefile b/tests/Makefile index d5295ac13..e94c6fdee 100644 --- a/tests/Makefile +++ b/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/tests/test.h b/tests/test.h index bc30507ca..d2d7ec72d 100644 --- a/tests/test.h +++ b/tests/test.h @@ -2,7 +2,7 @@ #include #include -#include +#include #define ASSERT(x) \ do { \