base/asm-common.h (x86), and knock-on: Add macros for full-size regs.

[catacomb] / base / Makefile.am

diff --git a/base/Makefile.am b/base/Makefile.am
index 0ac43f2..8b7c0fc 100644 (file)
--- a/base/Makefile.am
+++ b/base/Makefile.am
@@ -29,6 +29,8 @@ include $(top_srcdir)/vars.am
 noinst_LTLIBRARIES      = libbase.la
 libbase_la_SOURCES      =
 
+TEST_LIBS               = libbase.la
+
 ###--------------------------------------------------------------------------
 ### Component files.
 
@@ -38,11 +40,17 @@ libbase_la_SOURCES  += arena.c
 
 ## Constant-type operations.
 pkginclude_HEADERS     += ct.h
-libbase_la_SOURCES     += ct.c
+libbase_la_SOURCES     += ct.c ct-test.c
 
 ## CPU-specific dispatch.
 pkginclude_HEADERS     += dispatch.h
 libbase_la_SOURCES     += dispatch.c
+if CPUFAM_X86
+libbase_la_SOURCES     += dispatch-x86ish.S
+endif
+if CPUFAM_AMD64
+libbase_la_SOURCES     += dispatch-x86ish.S
+endif
 
 ## Acceptable key-size descriptions.
 pkginclude_HEADERS     += keysz.h
@@ -55,7 +63,29 @@ libbase_la_SOURCES   += lmem.c
 ## Clearing secrets from memory.
 pkginclude_HEADERS     += paranoia.h
 
+## Reservoir handling.
+pkginclude_HEADERS     += rsvr.h
+libbase_la_SOURCES     += rsvr.c
+TESTS                  += rsvr.t$(EXEEXT)
+EXTRA_DIST             += t/rsvr
+
 ## Base definitions for assembler source.
 EXTRA_DIST             += asm-common.h
 
+if ASM_DEBUG
+libbase_la_SOURCES     += regdump.c regdump.h
+if CPUFAM_X86
+libbase_la_SOURCES     += regdump-x86ish.S
+endif
+if CPUFAM_AMD64
+libbase_la_SOURCES     += regdump-x86ish.S
+endif
+if CPUFAM_ARMEL
+libbase_la_SOURCES     += regdump-arm.S
+endif
+if CPUFAM_ARM64
+libbase_la_SOURCES     += regdump-arm64.S
+endif
+endif
+
 ###----- That's all, folks --------------------------------------------------