Start trying to get asm BigInt working. Currently does not. Just checking

this in and sync'ing before I take a break. However the info.txts are now
cleaned up and more or less accurate now. But configure.pl is not tracking
dependencies properly.

10 files changed, 84 insertions, 56 deletions

diff --git a/src/bigint/info.txt b/src/bigint/info.txt
index b82d1cd72..3e1531754 100644
--- a/src/bigint/info.txt
+++ b/src/bigint/info.txt
@@ -7,6 +7,8 @@ define BIGINT
 <requires>
 hex
 mp_amd64
+monty_amd64|monty_generic
+mulop_generic
 </requires>
 
 <add>
@@ -25,7 +27,5 @@ mp_asm.cpp
 mp_comba.cpp
 mp_karat.cpp
 mp_misc.cpp
-mp_monty.cpp
-mp_mulop.cpp
 mp_shift.cpp
 </add>
diff --git a/src/bigint/monty_amd64/xxxinfo.txt b/src/bigint/monty_amd64/info.txt
index 2a8f9fe5b..32308bf41 100644
--- a/src/bigint/monty_amd64/xxxinfo.txt
+++ b/src/bigint/monty_amd64/info.txt
@@ -1,20 +1,17 @@
-realname "x86-64 Assembler"
+realname "Montgomery Reduction (x86-64)"
 
 mp_bits 64
 
 load_on request
 
-<ignore>
-#mp_mulop.cpp
-#mp_monty.cpp
-</ignore>
-
 <add>
-asm_macr.h
-#mp_mulop_amd64.S
-#mp_monty.S
+mp_monty.S
 </add>
 
+<requires>
+asm_amd64
+</requires>
+
 <arch>
 amd64
 </arch>
diff --git a/src/bigint/monty_generic/info.txt b/src/bigint/monty_generic/info.txt
new file mode 100644
index 000000000..9187e9d22
--- /dev/null
+++ b/src/bigint/monty_generic/info.txt
@@ -0,0 +1,7 @@
+realname "Montgomery Reduction"
+
+load_on request
+
+<add>
+mp_monty.cpp
+</add>
diff --git a/src/bigint/mp_monty.cpp b/src/bigint/monty_generic/mp_monty.cpp
index c162bfd4f..c162bfd4f 100644
--- a/src/bigint/mp_monty.cpp
+++ b/src/bigint/monty_generic/mp_monty.cpp
diff --git a/src/bigint/mp_generic/info.txt b/src/bigint/mp_generic/info.txt
index 22c2140fb..8b319c58d 100644
--- a/src/bigint/mp_generic/info.txt
+++ b/src/bigint/mp_generic/info.txt
@@ -1,7 +1,5 @@
 realname "MPI Core (C++)"
 
-mp_bits 32
-
 load_on request
 
 <add>
diff --git a/src/bigint/mulop_amd64/info.txt b/src/bigint/mulop_amd64/info.txt
new file mode 100644
index 000000000..0960ac4d6
--- /dev/null
+++ b/src/bigint/mulop_amd64/info.txt
@@ -0,0 +1,31 @@
+realname "BigInt Multiply-Add (x86-64)"
+
+mp_bits 64
+
+load_on request
+
+<add>
+mp_mulop_amd64.S
+</add>
+
+<requires>
+asm_amd64
+</requires>
+
+<arch>
+amd64
+</arch>
+
+<cc>
+gcc
+icc
+</cc>
+
+# ELF systems
+<os>
+linux
+freebsd
+netbsd
+openbsd
+solaris
+</os>
diff --git a/src/bigint/mulop_generic/info.txt b/src/bigint/mulop_generic/info.txt
new file mode 100644
index 000000000..1fe3c2868
--- /dev/null
+++ b/src/bigint/mulop_generic/info.txt
@@ -0,0 +1,7 @@
+realname "BigInt Multiply-Add"
+
+load_on request
+
+<add>
+mp_mulop.cpp
+</add>
diff --git a/src/bigint/mp_mulop.cpp b/src/bigint/mulop_generic/mp_mulop.cpp
index 3ab28d306..3ab28d306 100644
--- a/src/bigint/mp_mulop.cpp
+++ b/src/bigint/mulop_generic/mp_mulop.cpp
diff --git a/src/bigint/mulop_ia32/info.txt b/src/bigint/mulop_ia32/info.txt
new file mode 100644
index 000000000..0814bc08a
--- /dev/null
+++ b/src/bigint/mulop_ia32/info.txt
@@ -0,0 +1,31 @@
+realname "BigInt Multiply-Add (IA-32)"
+
+mp_bits 32
+
+load_on request
+
+<add>
+mp_mulop.S
+</add>
+
+<requires>
+asm_amd64
+</requires>
+
+<arch>
+ia32
+</arch>
+
+<cc>
+gcc
+icc
+</cc>
+
+# ELF systems
+<os>
+linux
+freebsd
+netbsd
+openbsd
+solaris
+</os>
diff --git a/src/bigint/mulop_ia32/xxxinfo.txt b/src/bigint/mulop_ia32/xxxinfo.txt
deleted file mode 100644
index 12c8cd96d..000000000
--- a/src/bigint/mulop_ia32/xxxinfo.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-realname "x86 Assembler"
-
-#mp_bits 32
-
-load_on asm_ok
-
-<replace>
-md4.cpp
-md5.cpp
-sha160.cpp
-serpent.cpp
-</replace>
-
-<ignore>
-#mp_mulop.cpp
-</ignore>
-
-<add>
-asm_macr.h
-md4core.S
-md5core.S
-sha1_asm.S
-serp_asm.S
-#mp_mulop.S
-</add>
-
-<arch>
-ia32
-</arch>
-
-<cc>
-gcc
-icc
-</cc>
-
-# ELF systems
-<os>
-linux
-freebsd
-netbsd
-openbsd
-solaris
-</os>