Commit 2269cc65 authored by Julian Kranz's avatar Julian Kranz

Merge branch 'master' of versioncontrolseidl.in.tum.de:gesselbe/gdsl-toolkit

parents f40a1273 05e546a5
......@@ -204,17 +204,39 @@ GDSL_AVRSEM = \
$(srcdir)/specifications/avr/avr-rreil-pretty.ml \
$(srcdir)/specifications/avr/avr-liveness.ml
GDSL_MIPS = \
GDSL_MIPS5 = \
$(srcdir)/specifications/mips/mips.ml \
$(srcdir)/specifications/mips/mips-asm.ml \
$(srcdir)/specifications/mips/mips-traverse.ml \
$(srcdir)/specifications/mips/mips-pretty.ml
$(srcdir)/specifications/mips/mips-pretty.ml \
$(srcdir)/specifications/mips/mips_r5.ml \
$(srcdir)/specifications/mips/mips-asm_r5.ml \
$(srcdir)/specifications/mips/mips-traverse_r5.ml \
$(srcdir)/specifications/mips/mips-pretty_r5.ml
GDSL_MIPSSEM = \
GDSL_MIPS5SEM = \
$(srcdir)/specifications/mips/mips-rreil-translator.ml \
$(srcdir)/specifications/mips/mips-rreil-registermapping.ml \
$(srcdir)/specifications/mips/mips-rreil-pretty.ml \
$(srcdir)/specifications/mips/mips-liveness.ml
$(srcdir)/specifications/mips/mips-liveness.ml \
$(srcdir)/specifications/mips/mips-rreil-translator_r5.ml
GDSL_MIPS6 = \
$(srcdir)/specifications/mips/mips.ml \
$(srcdir)/specifications/mips/mips-asm.ml \
$(srcdir)/specifications/mips/mips-traverse.ml \
$(srcdir)/specifications/mips/mips-pretty.ml \
$(srcdir)/specifications/mips/mips_r6.ml \
$(srcdir)/specifications/mips/mips-asm_r6.ml \
$(srcdir)/specifications/mips/mips-traverse_r6.ml \
$(srcdir)/specifications/mips/mips-pretty_r6.ml
GDSL_MIPS6SEM = \
$(srcdir)/specifications/mips/mips-rreil-translator.ml \
$(srcdir)/specifications/mips/mips-rreil-registermapping.ml \
$(srcdir)/specifications/mips/mips-rreil-pretty.ml \
$(srcdir)/specifications/mips/mips-liveness.ml \
$(srcdir)/specifications/mips/mips-rreil-translator_r6.ml
GDSL_ARM7 = \
$(srcdir)/specifications/arm7/arm7.ml \
......@@ -333,7 +355,52 @@ GS_AVR = $(GDSL_BASIS) $(GDSL_ASM) $(GDSL_AVR)
gdsl-avr.c: $(GDSLC_DEP) $(GS_AVR)
$(GDSLC) -o $(basename $@) $(GDSLFLAGS) $(GS_AVR)
if MIPS_RREIL
if MIPS5_RREIL
lib_LTLIBRARIES += libgdsl-mips-rreil.la
#libjgdsl_la_LIBADD += libgdsl-mips-rreil.la
#semantics_opt_LDADD += libgdsl-mips-rreil.la
nodist_include_HEADERS += gdsl-mips-rreil.h
CLEANFILES += gdsl-mips-rreil.c gdsl-mips-rreil.h
if INSTALL_AUXBINS
bin_PROGRAMS += gdsl-mips-rreil-demo
endif
if BUILD_AUXBINS
noinst_PROGRAMS += gdsl-mips-rreil-demo
endif
endif
libgdsl_mips_rreil_la_SOURCES =
nodist_libgdsl_mips_rreil_la_SOURCES = gdsl-mips-rreil.c
libgdsl_mips_rreil_la_DEPENDENCIES = $(GDSLC_DEP)
gdsl_mips_rreil_demo_SOURCES = gdsl-mips-rreil.c
gdsl_mips_rreil_demo_CFLAGS = -std=c99 -DWITHMAIN
GS_MIPS_RREIL = $(GDSL_BASIS) $(GDSL_ASM) $(GDSL_MIPS5) $(GDSL_RREIL) $(GDSL_MIPS5SEM)
gdsl-mips-rreil.c: $(GDSLC_DEP) $(GS_MIPS_RREIL)
$(GDSLC) -o $(basename $@) $(GDSLFLAGS) $(GS_MIPS_RREIL)
if MIPS5
lib_LTLIBRARIES += libgdsl-mips.la
#decoder_cli_LDADD += libgdsl-mips.la
nodist_include_HEADERS += gdsl-mips.h
CLEANFILES += gdsl-mips.c gdsl-mips.h
if INSTALL_AUXBINS
bin_PROGRAMS += gdsl-mips-demo
endif
if BUILD_AUXBINS
noinst_PROGRAMS += gdsl-mips-demo
endif
endif
libgdsl_mips_la_SOURCES =
nodist_libgdsl_mips_la_SOURCES = gdsl-mips.c
libgdsl_mips_la_DEPENDENCIES = $(GDSLC_DEP)
gdsl_mips_demo_SOURCES = gdsl-mips.c
gdsl_mips_demo_CFLAGS = -std=c99 -DWITHMAIN
GS_MIPS = $(GDSL_BASIS) $(GDSL_ASM) $(GDSL_MIPS5)
gdsl-mips.c: $(GDSLC_DEP) $(GS_MIPS)
$(GDSLC) -o $(basename $@) $(GDSLFLAGS) $(GS_MIPS)
if MIPS6_RREIL
lib_LTLIBRARIES += libgdsl-mips-rreil.la
#libjgdsl_la_LIBADD += libgdsl-mips-rreil.la
#semantics_opt_LDADD += libgdsl-mips-rreil.la
......@@ -352,11 +419,11 @@ libgdsl_mips_rreil_la_DEPENDENCIES = $(GDSLC_DEP)
gdsl_mips_rreil_demo_SOURCES = gdsl-mips-rreil.c
gdsl_mips_rreil_demo_CFLAGS = -std=c99 -DWITHMAIN
GS_MIPS_RREIL = $(GDSL_BASIS) $(GDSL_ASM) $(GDSL_MIPS) $(GDSL_RREIL) $(GDSL_MIPSSEM)
GS_MIPS_RREIL = $(GDSL_BASIS) $(GDSL_ASM) $(GDSL_MIPS6) $(GDSL_RREIL) $(GDSL_MIPS6SEM)
gdsl-mips-rreil.c: $(GDSLC_DEP) $(GS_MIPS_RREIL)
$(GDSLC) -o $(basename $@) $(GDSLFLAGS) $(GS_MIPS_RREIL)
if MIPS
if MIPS6
lib_LTLIBRARIES += libgdsl-mips.la
#decoder_cli_LDADD += libgdsl-mips.la
nodist_include_HEADERS += gdsl-mips.h
......@@ -374,7 +441,7 @@ libgdsl_mips_la_DEPENDENCIES = $(GDSLC_DEP)
gdsl_mips_demo_SOURCES = gdsl-mips.c
gdsl_mips_demo_CFLAGS = -std=c99 -DWITHMAIN
GS_MIPS = $(GDSL_BASIS) $(GDSL_ASM) $(GDSL_MIPS)
GS_MIPS = $(GDSL_BASIS) $(GDSL_ASM) $(GDSL_MIPS6)
gdsl-mips.c: $(GDSLC_DEP) $(GS_MIPS)
$(GDSLC) -o $(basename $@) $(GDSLFLAGS) $(GS_MIPS)
......@@ -656,9 +723,9 @@ private_headers += $(srcdir)/tools/x86-test-stats-runner/src/hash_array.h
MLLPT_LIB = $(srcdir)/detail/external/mllpt-lib/repair.sml $(srcdir)/detail/external/mllpt-lib/NJ-LICENSE $(srcdir)/detail/external/mllpt-lib/stream-pos.sml $(srcdir)/detail/external/mllpt-lib/ml-lpt-lib.cm $(srcdir)/detail/external/mllpt-lib/mllpt-lib.mlb $(srcdir)/detail/external/mllpt-lib/err-handler.sml $(srcdir)/detail/external/mllpt-lib/MLton-LICENSE $(srcdir)/detail/external/mllpt-lib/ulex-buffer.sml $(srcdir)/detail/external/mllpt-lib/ml-lpt-lib.mlb $(srcdir)/detail/external/mllpt-lib/wrapped-strm.sml $(srcdir)/detail/external/mllpt-lib/antlr-tokens-sig.sml $(srcdir)/detail/external/mllpt-lib/antlr-lexer-sig.sml $(srcdir)/detail/external/mllpt-lib/ebnf.sml
EXTRA_DIST = LICENSE $(JSOURCES_FULLPATH) $(MLLPT_LIB) $(GDSL_BASIS) $(GDSL_ASM) $(GDSL_X86) $(GDSL_RREIL) $(GDSL_X86SEM) $(GDSL_AVR) $(GDSL_AVRSEM) $(GDSL_MIPS) $(GDSL_MIPSSEM) $(GDSL_ARM7) $(private_headers) $(RUNTIME) $(srcdir)/gdsl.h $(srcdir)/gdslc.mlb $(srcdir)/gdsl.cm $(GDSLC_SML_FILES) $(srcdir)/detail/ml/smlnj/unsealed.cm build.bat
EXTRA_DIST = LICENSE $(JSOURCES_FULLPATH) $(MLLPT_LIB) $(GDSL_BASIS) $(GDSL_ASM) $(GDSL_X86) $(GDSL_RREIL) $(GDSL_X86SEM) $(GDSL_AVR) $(GDSL_AVRSEM) $(GDSL_MIPS5) $(GDSL_MIPS5SEM) $(GDSL_MIPS6) $(GDSL_MIPS6SEM) $(GDSL_ARM7) $(private_headers) $(RUNTIME) $(srcdir)/gdsl.h $(srcdir)/gdslc.mlb $(srcdir)/gdsl.cm $(GDSLC_SML_FILES) $(srcdir)/detail/ml/smlnj/unsealed.cm build.bat
WINDOWS_DISTFILES = $(GDSLC) LICENSE $(GDSL_BASIS) $(GDSL_ASM) $(GDSL_X86) $(GDSL_RREIL) $(GDSL_X86SEM) $(GDSL_AVR) $(GDSL_AVRSEM) $(GDSL_MIPS) $(GDSL_MIPSSEM) $(GDSL_ARM7) $(RUNTIME) build.bat
WINDOWS_DISTFILES = $(GDSLC) LICENSE $(GDSL_BASIS) $(GDSL_ASM) $(GDSL_X86) $(GDSL_RREIL) $(GDSL_X86SEM) $(GDSL_AVR) $(GDSL_AVRSEM) $(GDSL_MIPS5) $(GDSL_MIPS5SEM) $(GDSL_MIPS6) $(GDSL_MIPS6SEM) $(GDSL_ARM7) $(RUNTIME) build.bat
# distribution .tgz file for Windows
.PHONY: win-distdir win-dist
......
......@@ -23,7 +23,7 @@ GDSL_OPT_HL=specifications/rreil/rreil-liveness.ml specifications/rreil/rreil-fo
GDSL_MIPS_HL_R5=specifications/mips/mips_r5.ml specifications/mips/mips-pretty_r5.ml specifications/mips/mips-rreil-translator_r5.ml specifications/mips/mips-asm_r5.ml specifications/mips/mips-traverse_r5.ml
GDSL_MIPS_HL_R6=specifications/mips/mips_r6.ml specifications/mips/mips-pretty_r6.ml specifications/mips/mips-rreil-translator_r6.ml specifications/mips/mips-asm_r6.ml specifications/mips/mips-traverse_r6.ml
GDSL_MIPS_HL=specifications/mips/mips.ml specifications/mips/mips-pretty.ml specifications/mips/mips-rreil-pretty.ml specifications/mips/mips-rreil-registermapping.ml specifications/mips/mips-rreil-translator.ml specifications/mips/mips-liveness.ml specifications/mips/mips-asm.ml specifications/mips/mips-traverse.ml $(GDSL_MIPS_HL_R5)
GDSL_MIPS_HL=specifications/mips/mips.ml specifications/mips/mips-pretty.ml specifications/mips/mips-rreil-pretty.ml specifications/mips/mips-rreil-registermapping.ml specifications/mips/mips-rreil-translator.ml specifications/mips/mips-liveness.ml specifications/mips/mips-asm.ml specifications/mips/mips-traverse.ml $(GDSL_MIPS_HL_R6)
GDSL_MIPS_TRANS_HL=
GDSL_SOURCES=$(GDSL_BASIS_HL) $(GDSL_RREIL_HL) $(GDSL_MIPS_HL) $(GDSL_MIPS_TRANS_HL) $(GDSL_OPT_HL) $(GDSL_ASM_HL)
......
......@@ -55,12 +55,12 @@ AM_CONDITIONAL(LINUX, test "$LINUX" = "yes")
#AM_CONDITIONAL(HAVE_JNI_H, test "$HAVE_JNI_H" != "")
dnl conditionals for the various decoders, either with or without semantics
FRONTENDS="x86 x86-rreil avr avr-rreil mips mips-rreil arm7 arm7-rreil";
FRONTENDS="x86 x86-rreil avr avr-rreil mips5 mips5-rreil mips6 mips6-rreil arm7 arm7-rreil";
AC_ARG_WITH([frontend],
[AS_HELP_STRING(
[--with-frontend=frontend],
[one of: x86 x86-rreil avr avr-rreil mips mips-rreil arm7 arm7-rreil])],
[one of: x86 x86-rreil avr avr-rreil mips5 mips5-rreil mips6 mips6-rreil arm7 arm7-rreil])],
[], [with_frontend=all])
case $with_frontend in
......@@ -78,12 +78,18 @@ case $with_frontend in
avr-rreil)
AC_DEFINE([USE_AVR_RREIL],[1],[build AVR decoder and RReil semantics])
with_frontend=avr-rreil;;
mips)
AC_DEFINE([USE_MIPS],[1],[build MIPS bare decoder])
with_frontend=mips;;
mips-rreil)
AC_DEFINE([USE_MIPS_RREIL],[1],[build MIPS decoder and RReil semantics])
with_frontend=mips-rreil;;
mips5)
AC_DEFINE([USE_MIPS5],[1],[build MIPS5 bare decoder])
with_frontend=mips5;;
mips5-rreil)
AC_DEFINE([USE_MIPS5_RREIL],[1],[build MIPS5 decoder and RReil semantics])
with_frontend=mips5-rreil;;
mips6)
AC_DEFINE([USE_MIPS6],[1],[build MIPS6 bare decoder])
with_frontend=mips6;;
mips6-rreil)
AC_DEFINE([USE_MIPS6_RREIL],[1],[build MIPS6 decoder and RReil semantics])
with_frontend=mips6-rreil;;
arm7)
AC_DEFINE([USE_ARM7],[1],[build ARM7 bare decoder])
with_frontend=arm7;;
......@@ -144,8 +150,10 @@ AM_CONDITIONAL([X86_RREIL],[test x$with_frontend = xx86-rreil -o x$with_frontend
AM_CONDITIONAL([X86],[test x$with_frontend = xx86 -o x$with_frontend = xall])
AM_CONDITIONAL([AVR_RREIL],[test x$with_frontend = xavr-rreil -o x$with_frontend = xall])
AM_CONDITIONAL([AVR],[test x$with_frontend = xavr -o x$with_frontend = xall])
AM_CONDITIONAL([MIPS_RREIL],[test x$with_frontend = xmips-rreil -o x$with_frontend = xall])
AM_CONDITIONAL([MIPS],[test x$with_frontend = xmips -o x$with_frontend = xall])
AM_CONDITIONAL([MIPS5_RREIL],[test x$with_frontend = xmips5-rreil -o x$with_frontend = xall])
AM_CONDITIONAL([MIPS5],[test x$with_frontend = xmips5 -o x$with_frontend = xall])
AM_CONDITIONAL([MIPS6_RREIL],[test x$with_frontend = xmips6-rreil -o x$with_frontend = xall])
AM_CONDITIONAL([MIPS6],[test x$with_frontend = xmips6 -o x$with_frontend = xall])
AM_CONDITIONAL([ARM7_RREIL],[test x$with_frontend = xarm7-rreil -o x$with_frontend = xall])
AM_CONDITIONAL([ARM7],[test x$with_frontend = xarm7 -o x$with_frontend = xall])
AM_CONDITIONAL([HAVE_RREIL],[test x$has_rreil = xyes -o x$with_frontend = xall])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment