Changeset 455a7d5 for libcfa/prelude
- Timestamp:
- Aug 9, 2018, 6:35:02 PM (7 years ago)
- Branches:
- ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum
- Children:
- ea5b7d6
- Parents:
- fb975a50 (diff), 0c827019 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)links above to see all the changes relative to each parent. - Location:
- libcfa/prelude
- Files:
-
- 14 moved
-
Makefile.am (moved) (moved from src/prelude/Makefile.am ) (3 diffs)
-
Makefile.in (moved) (moved from src/prelude/Makefile.in ) (13 diffs)
-
bootloader.cf (moved) (moved from src/prelude/bootloader.cf )
-
builtins.c (moved) (moved from src/prelude/builtins.c ) (2 diffs)
-
builtins.def (moved) (moved from src/prelude/builtins.def )
-
extras.c (moved) (moved from src/prelude/extras.c )
-
extras.regx (moved) (moved from src/prelude/extras.regx )
-
prelude-gen.cc (moved) (moved from src/prelude/prelude-gen.cc )
-
prelude.old.cf (moved) (moved from src/prelude/prelude.old.cf )
-
prototypes.awk (moved) (moved from src/prelude/prototypes.awk )
-
prototypes.c (moved) (moved from src/prelude/prototypes.c )
-
prototypes.sed (moved) (moved from src/prelude/prototypes.sed )
-
sync-builtins.cf (moved) (moved from src/prelude/sync-builtins.cf )
-
sync-builtins.def (moved) (moved from src/prelude/sync-builtins.def )
Legend:
- Unmodified
- Added
- Removed
-
libcfa/prelude/Makefile.am
rfb975a50 r455a7d5 21 21 cfalibdir = ${CFA_LIBDIR} 22 22 cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cf bootloader.c 23 noinst_DATA = ../ libcfa/libcfa-prelude.c23 noinst_DATA = ../src/prelude.c 24 24 25 CC = ${abs_top_builddir}/src/driver/cfa 25 CC = @CFACC@ 26 AM_CFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@ 27 AM_CFAFLAGS = @CONFIG_CFAFLAGS@ 26 28 27 29 $(DEPDIR) : … … 33 35 # create extra forward types/declarations to reduce inclusion of library files 34 36 extras.cf : ${srcdir}/extras.regx ${srcdir}/extras.c 35 ${AM_V_GEN} @BACKEND_CC@ @CFA_FLAGS@-E ${srcdir}/extras.c | grep -f ${srcdir}/extras.regx > extras.cf37 ${AM_V_GEN}gcc ${AM_CFLAGS} -E ${srcdir}/extras.c | grep -f ${srcdir}/extras.regx > extras.cf 36 38 37 39 # create forward declarations for gcc builtins 38 40 gcc-builtins.cf : gcc-builtins.c ${srcdir}/prototypes.sed 39 ${AM_V_GEN} @BACKEND_CC@ @CFA_FLAGS@-I${srcdir} -E -P $< | sed -r -f ${srcdir}/prototypes.sed > $@41 ${AM_V_GEN}gcc -I${srcdir} -E -P $< | sed -r -f ${srcdir}/prototypes.sed > $@ 40 42 41 43 gcc-builtins.c : ${srcdir}/builtins.def ${srcdir}/prototypes.awk ${srcdir}/sync-builtins.cf ${srcdir}/prototypes.c 42 ${AM_V_GEN} @BACKEND_CC@ @CFA_FLAGS@-I${srcdir} -E ${srcdir}/prototypes.c | awk -f ${srcdir}/prototypes.awk > $@44 ${AM_V_GEN}gcc -I${srcdir} -E ${srcdir}/prototypes.c | awk -f ${srcdir}/prototypes.awk > $@ 43 45 44 46 prelude.cf : prelude-gen.cc 45 ${AM_V_GEN}${CXX} ${AM_CXXFLAGS} ${CXXFLAGS} ${ <} -o prelude-gen -Wall -Wextra -O2 -g -std=c++1447 ${AM_V_GEN}${CXX} ${AM_CXXFLAGS} ${CXXFLAGS} ${AM_CFLAGS} ${<} -o prelude-gen -Wall -Wextra -O2 -g -std=c++14 46 48 @./prelude-gen > $@ 47 49 @rm ./prelude-gen … … 53 55 # create forward declarations for cfa builtins 54 56 builtins.cf : builtins.c ${CC} 55 ${AM_V_GEN} ${CC} -E -P ${<} -o ${@} -MD -MP -MF $(DEPDIR)/builtins.Po57 ${AM_V_GEN}gcc ${AM_CFLAGS} -E -P ${<} -o ${@} -MD -MP -MF $(DEPDIR)/builtins.Po 56 58 ${AM_V_at}sed -i 's/builtins.o/builtins.cf/g' $(DEPDIR)/builtins.Po 57 59 58 60 include $(DEPDIR)/builtins.Po 59 61 60 ../ libcfa/libcfa-prelude.c : prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_builddir}/src/driver/cfa-cpp61 ${AM_V_GEN} ${abs_top_builddir}/src/driver/cfa-cpp-l prelude.cf $@ # use src/cfa-cpp as not in lib until after install62 ../src/prelude.c : prelude.cf extras.cf gcc-builtins.cf builtins.cf @CFACPP@ 63 ${AM_V_GEN}@CFACPP@ --prelude-dir=${builddir} -l prelude.cf $@ # use src/cfa-cpp as not in lib until after install 62 64 63 bootloader.c : ${srcdir}/bootloader.cf prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_builddir}/src/driver/cfa-cpp64 ${AM_V_GEN} ${abs_top_builddir}/src/driver/cfa-cpp-tpm ${srcdir}/bootloader.cf $@ # use src/cfa-cpp as not in lib until after install65 bootloader.c : ${srcdir}/bootloader.cf prelude.cf extras.cf gcc-builtins.cf builtins.cf @CFACPP@ 66 ${AM_V_GEN}@CFACPP@ --prelude-dir=${builddir} -tpm ${srcdir}/bootloader.cf $@ # use src/cfa-cpp as not in lib until after install 65 67 66 68 maintainer-clean-local : 67 69 rm -rf $(DEPDIR) 68 70 69 MAINTAINERCLEANFILES = gcc-builtins.c gcc-builtins.cf builtins.cf extras.cf bootloader.c prelude.cf ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}} 71 MOSTLYCLEANFILES = bootloader.c builtins.cf extras.cf gcc-builtins.c gcc-builtins.cf prelude.cf 72 MAINTAINERCLEANFILES = ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}} -
libcfa/prelude/Makefile.in
rfb975a50 r455a7d5 90 90 PRE_UNINSTALL = : 91 91 POST_UNINSTALL = : 92 build_triplet = @build@ 93 host_triplet = @host@ 94 subdir = src/prelude 92 subdir = prelude 95 93 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 96 am__aclocal_m4_deps = $(top_srcdir)/configure.ac 94 am__aclocal_m4_deps = $(top_srcdir)/../automake/cfa.m4 \ 95 $(top_srcdir)/configure.ac 97 96 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 98 97 $(ACLOCAL_M4) 99 98 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) 100 99 mkinstalldirs = $(install_sh) -d 101 CONFIG_HEADER = $(top_builddir)/config.h102 100 CONFIG_CLEAN_FILES = 103 101 CONFIG_CLEAN_VPATH_FILES = … … 154 152 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 155 153 ACLOCAL = @ACLOCAL@ 156 ALLOCA = @ALLOCA@157 154 AMTAR = @AMTAR@ 158 155 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ 156 ARCHITECTURE = @ARCHITECTURE@ 157 ARCH_FLAGS = @ARCH_FLAGS@ 159 158 AUTOCONF = @AUTOCONF@ 160 159 AUTOHEADER = @AUTOHEADER@ 161 160 AUTOMAKE = @AUTOMAKE@ 162 161 AWK = @AWK@ 163 BACKEND_CC = @BACKEND_CC@ 164 CC = ${abs_top_builddir}/src/driver/cfa 162 CC = @CFACC@ 165 163 CCAS = @CCAS@ 166 164 CCASDEPMODE = @CCASDEPMODE@ 167 165 CCASFLAGS = @CCASFLAGS@ 168 166 CCDEPMODE = @CCDEPMODE@ 169 CFA_BACKEND_CC = @CFA_BACKEND_CC@ 167 CFACC = @CFACC@ 168 CFACPP = @CFACPP@ 170 169 CFA_BINDIR = @CFA_BINDIR@ 171 CFA_FLAGS = @CFA_FLAGS@172 170 CFA_INCDIR = @CFA_INCDIR@ 173 171 CFA_LIBDIR = @CFA_LIBDIR@ … … 175 173 CFA_PREFIX = @CFA_PREFIX@ 176 174 CFLAGS = @CFLAGS@ 177 CPP = @CPP@ 175 CONFIGURATION = @CONFIGURATION@ 176 CONFIG_CFAFLAGS = @CONFIG_CFAFLAGS@ 177 CONFIG_CFLAGS = @CONFIG_CFLAGS@ 178 178 CPPFLAGS = @CPPFLAGS@ 179 179 CXX = @CXX@ … … 183 183 DEFS = @DEFS@ 184 184 DEPDIR = @DEPDIR@ 185 DRIVER_DIR = @DRIVER_DIR@ 185 186 ECHO_C = @ECHO_C@ 186 187 ECHO_N = @ECHO_N@ 187 188 ECHO_T = @ECHO_T@ 188 EGREP = @EGREP@189 189 EXEEXT = @EXEEXT@ 190 GREP = @GREP@191 190 INSTALL = @INSTALL@ 192 191 INSTALL_DATA = @INSTALL_DATA@ … … 195 194 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ 196 195 LDFLAGS = @LDFLAGS@ 197 LEX = @LEX@198 LEXLIB = @LEXLIB@199 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@200 196 LIBOBJS = @LIBOBJS@ 201 197 LIBS = @LIBS@ 202 198 LTLIBOBJS = @LTLIBOBJS@ 203 MACHINE_TYPE = @MACHINE_TYPE@204 199 MAKEINFO = @MAKEINFO@ 205 200 MKDIR_P = @MKDIR_P@ … … 218 213 STRIP = @STRIP@ 219 214 VERSION = @VERSION@ 220 YACC = @YACC@221 YFLAGS = @YFLAGS@222 215 abs_builddir = @abs_builddir@ 223 216 abs_srcdir = @abs_srcdir@ … … 232 225 am__untar = @am__untar@ 233 226 bindir = @bindir@ 234 build = @build@235 227 build_alias = @build_alias@ 236 build_cpu = @build_cpu@237 build_os = @build_os@238 build_vendor = @build_vendor@239 228 builddir = @builddir@ 240 229 datadir = @datadir@ … … 243 232 dvidir = @dvidir@ 244 233 exec_prefix = @exec_prefix@ 245 host = @host@246 234 host_alias = @host_alias@ 247 host_cpu = @host_cpu@248 host_os = @host_os@249 host_vendor = @host_vendor@250 235 htmldir = @htmldir@ 251 236 includedir = @includedir@ … … 279 264 cfalibdir = ${CFA_LIBDIR} 280 265 cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cf bootloader.c 281 noinst_DATA = ../libcfa/libcfa-prelude.c 282 MAINTAINERCLEANFILES = gcc-builtins.c gcc-builtins.cf builtins.cf extras.cf bootloader.c prelude.cf ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}} 266 noinst_DATA = ../src/prelude.c 267 AM_CFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@ 268 AM_CFAFLAGS = @CONFIG_CFAFLAGS@ 269 MOSTLYCLEANFILES = bootloader.c builtins.cf extras.cf gcc-builtins.c gcc-builtins.cf prelude.cf 270 MAINTAINERCLEANFILES = ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}} 283 271 all: all-am 284 272 … … 293 281 esac; \ 294 282 done; \ 295 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/prelude/Makefile'; \283 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign prelude/Makefile'; \ 296 284 $(am__cd) $(top_srcdir) && \ 297 $(AUTOMAKE) --foreign src/prelude/Makefile285 $(AUTOMAKE) --foreign prelude/Makefile 298 286 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status 299 287 @case '$?' in \ … … 398 386 fi 399 387 mostlyclean-generic: 388 -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) 400 389 401 390 clean-generic: … … 501 490 # create extra forward types/declarations to reduce inclusion of library files 502 491 extras.cf : ${srcdir}/extras.regx ${srcdir}/extras.c 503 ${AM_V_GEN} @BACKEND_CC@ @CFA_FLAGS@-E ${srcdir}/extras.c | grep -f ${srcdir}/extras.regx > extras.cf492 ${AM_V_GEN}gcc ${AM_CFLAGS} -E ${srcdir}/extras.c | grep -f ${srcdir}/extras.regx > extras.cf 504 493 505 494 # create forward declarations for gcc builtins 506 495 gcc-builtins.cf : gcc-builtins.c ${srcdir}/prototypes.sed 507 ${AM_V_GEN} @BACKEND_CC@ @CFA_FLAGS@-I${srcdir} -E -P $< | sed -r -f ${srcdir}/prototypes.sed > $@496 ${AM_V_GEN}gcc -I${srcdir} -E -P $< | sed -r -f ${srcdir}/prototypes.sed > $@ 508 497 509 498 gcc-builtins.c : ${srcdir}/builtins.def ${srcdir}/prototypes.awk ${srcdir}/sync-builtins.cf ${srcdir}/prototypes.c 510 ${AM_V_GEN} @BACKEND_CC@ @CFA_FLAGS@-I${srcdir} -E ${srcdir}/prototypes.c | awk -f ${srcdir}/prototypes.awk > $@499 ${AM_V_GEN}gcc -I${srcdir} -E ${srcdir}/prototypes.c | awk -f ${srcdir}/prototypes.awk > $@ 511 500 512 501 prelude.cf : prelude-gen.cc 513 ${AM_V_GEN}${CXX} ${AM_CXXFLAGS} ${CXXFLAGS} ${ <} -o prelude-gen -Wall -Wextra -O2 -g -std=c++14502 ${AM_V_GEN}${CXX} ${AM_CXXFLAGS} ${CXXFLAGS} ${AM_CFLAGS} ${<} -o prelude-gen -Wall -Wextra -O2 -g -std=c++14 514 503 @./prelude-gen > $@ 515 504 @rm ./prelude-gen … … 521 510 # create forward declarations for cfa builtins 522 511 builtins.cf : builtins.c ${CC} 523 ${AM_V_GEN} ${CC} -E -P ${<} -o ${@} -MD -MP -MF $(DEPDIR)/builtins.Po512 ${AM_V_GEN}gcc ${AM_CFLAGS} -E -P ${<} -o ${@} -MD -MP -MF $(DEPDIR)/builtins.Po 524 513 ${AM_V_at}sed -i 's/builtins.o/builtins.cf/g' $(DEPDIR)/builtins.Po 525 514 526 515 include $(DEPDIR)/builtins.Po 527 516 528 ../ libcfa/libcfa-prelude.c : prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_builddir}/src/driver/cfa-cpp529 ${AM_V_GEN} ${abs_top_builddir}/src/driver/cfa-cpp-l prelude.cf $@ # use src/cfa-cpp as not in lib until after install530 531 bootloader.c : ${srcdir}/bootloader.cf prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_builddir}/src/driver/cfa-cpp532 ${AM_V_GEN} ${abs_top_builddir}/src/driver/cfa-cpp-tpm ${srcdir}/bootloader.cf $@ # use src/cfa-cpp as not in lib until after install517 ../src/prelude.c : prelude.cf extras.cf gcc-builtins.cf builtins.cf @CFACPP@ 518 ${AM_V_GEN}@CFACPP@ --prelude-dir=${builddir} -l prelude.cf $@ # use src/cfa-cpp as not in lib until after install 519 520 bootloader.c : ${srcdir}/bootloader.cf prelude.cf extras.cf gcc-builtins.cf builtins.cf @CFACPP@ 521 ${AM_V_GEN}@CFACPP@ --prelude-dir=${builddir} -tpm ${srcdir}/bootloader.cf $@ # use src/cfa-cpp as not in lib until after install 533 522 534 523 maintainer-clean-local : -
libcfa/prelude/builtins.c
rfb975a50 r455a7d5 10 10 // Created On : Fri Jul 21 16:21:03 2017 11 11 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Thu Feb 8 12:47:59201813 // Update Count : 1912 // Last Modified On : Sun Aug 5 21:40:38 2018 13 // Update Count : 20 14 14 // 15 15 … … 18 18 typedef unsigned long long __cfaabi_abi_exception_type_t; 19 19 20 #include "../ libcfa/virtual.h"21 #include "../ libcfa/exception.h"20 #include "../src/virtual.h" 21 #include "../src/exception.h" 22 22 23 23 void exit( int status, const char fmt[], ... ) __attribute__ (( format(printf, 2, 3), __nothrow__, __leaf__, __noreturn__ )); 24 void abort 24 void abort( const char fmt[], ... ) __attribute__ (( format(printf, 1, 2), __nothrow__, __leaf__, __noreturn__ )); 25 25 26 26 // increment/decrement unification
Note:
See TracChangeset
for help on using the changeset viewer.
