From d48a2f396dede39eae20fcfe551bb11832360a5b Mon Sep 17 00:00:00 2001 From: David Monniaux Date: Wed, 30 Jan 2019 17:13:15 +0100 Subject: remove cruft dealing with __int128 and __thread --- test/monniaux/bitsliced-tea/Makefile | 2 +- test/monniaux/crypto-algorithms/Makefile | 2 +- test/monniaux/cycles.h | 2 +- test/monniaux/heapsort/Makefile | 2 +- test/monniaux/jpeg-6b/change.log | 217 ------------------------------- test/monniaux/jpeg-6b/make.log | 41 ------ test/monniaux/mod_int_mat/Makefile | 2 +- test/monniaux/quicksort/Makefile | 2 +- test/monniaux/sha-2/Makefile | 2 +- test/monniaux/tiny-AES-c/Makefile | 4 +- test/monniaux/uzlib/make.log | 24 ---- 11 files changed, 9 insertions(+), 291 deletions(-) delete mode 100644 test/monniaux/jpeg-6b/change.log delete mode 100644 test/monniaux/jpeg-6b/make.log delete mode 100644 test/monniaux/uzlib/make.log (limited to 'test') diff --git a/test/monniaux/bitsliced-tea/Makefile b/test/monniaux/bitsliced-tea/Makefile index 6ee08b81..622c8c6a 100644 --- a/test/monniaux/bitsliced-tea/Makefile +++ b/test/monniaux/bitsliced-tea/Makefile @@ -2,7 +2,7 @@ CFLAGS=-Wall -O3 K1C_CC=k1-mbr-gcc K1C_CFLAGS=-Wall -O3 -std=c99 K1C_CCOMP=../../../ccomp -K1C_CCOMPFLAGS=-Wall -O3 -D__thread= -D__int128=int +K1C_CCOMPFLAGS=-Wall -O3 PRODUCTS=bstea.host bstea.gcc.k1c.out bstea.ccomp.k1c.out bstea.ccomp.k1c.s bstea.gcc.k1c.s bstea.gcc.k1c bstea.ccomp.k1c diff --git a/test/monniaux/crypto-algorithms/Makefile b/test/monniaux/crypto-algorithms/Makefile index db372898..772323be 100644 --- a/test/monniaux/crypto-algorithms/Makefile +++ b/test/monniaux/crypto-algorithms/Makefile @@ -2,7 +2,7 @@ CFLAGS=-Wall -O3 K1C_CC=k1-mbr-gcc K1C_CFLAGS=-Wall -O3 K1C_CCOMP=../../../ccomp -K1C_CCOMPFLAGS=-Wall -O3 -D__thread= -D__int128=int +K1C_CCOMPFLAGS=-Wall -O3 all: md2.all md5.all sha1.all sha256.all blowfish.all des.all diff --git a/test/monniaux/cycles.h b/test/monniaux/cycles.h index 34f5bae5..b4160954 100644 --- a/test/monniaux/cycles.h +++ b/test/monniaux/cycles.h @@ -1,4 +1,4 @@ -typedef unsigned long long cycle_t; +typedef unsigned long cycle_t; #ifdef __K1C__ #include diff --git a/test/monniaux/heapsort/Makefile b/test/monniaux/heapsort/Makefile index 47dac2bb..c3aa07ac 100644 --- a/test/monniaux/heapsort/Makefile +++ b/test/monniaux/heapsort/Makefile @@ -2,7 +2,7 @@ CFLAGS=-Wall -O3 K1C_CC=k1-mbr-gcc K1C_CFLAGS=-Wall -O3 -std=c99 K1C_CCOMP=../../../ccomp -K1C_CCOMPFLAGS=-Wall -O3 -D__thread= -D__int128=int +K1C_CCOMPFLAGS=-Wall -O3 PRODUCTS=heapsort.host heapsort.gcc.k1c.out heapsort.ccomp.k1c.out heapsort.ccomp.k1c.s heapsort.gcc.k1c.s heapsort.gcc.k1c heapsort.ccomp.k1c diff --git a/test/monniaux/jpeg-6b/change.log b/test/monniaux/jpeg-6b/change.log deleted file mode 100644 index 74102c0d..00000000 --- a/test/monniaux/jpeg-6b/change.log +++ /dev/null @@ -1,217 +0,0 @@ -CHANGE LOG for Independent JPEG Group's JPEG software - - -Version 6b 27-Mar-1998 ------------------------ - -jpegtran has new features for lossless image transformations (rotation -and flipping) as well as "lossless" reduction to grayscale. - -jpegtran now copies comments by default; it has a -copy switch to enable -copying all APPn blocks as well, or to suppress comments. (Formerly it -always suppressed comments and APPn blocks.) jpegtran now also preserves -JFIF version and resolution information. - -New decompressor library feature: COM and APPn markers found in the input -file can be saved in memory for later use by the application. (Before, -you had to code this up yourself with a custom marker processor.) - -There is an unused field "void * client_data" now in compress and decompress -parameter structs; this may be useful in some applications. - -JFIF version number information is now saved by the decoder and accepted by -the encoder. jpegtran uses this to copy the source file's version number, -to ensure "jpegtran -copy all" won't create bogus files that contain JFXX -extensions but claim to be version 1.01. Applications that generate their -own JFXX extension markers also (finally) have a supported way to cause the -encoder to emit JFIF version number 1.02. - -djpeg's trace mode reports JFIF 1.02 thumbnail images as such, rather -than as unknown APP0 markers. - -In -verbose mode, djpeg and rdjpgcom will try to print the contents of -APP12 markers as text. Some digital cameras store useful text information -in APP12 markers. - -Handling of truncated data streams is more robust: blocks beyond the one in -which the error occurs will be output as uniform gray, or left unchanged -if decoding a progressive JPEG. The appearance no longer depends on the -Huffman tables being used. - -Huffman tables are checked for validity much more carefully than before. - -To avoid the Unisys LZW patent, djpeg's GIF output capability has been -changed to produce "uncompressed GIFs", and cjpeg's GIF input capability -has been removed altogether. We're not happy about it either, but there -seems to be no good alternative. - -The configure script now supports building libjpeg as a shared library -on many flavors of Unix (all the ones that GNU libtool knows how to -build shared libraries for). Use "./configure --enable-shared" to -try this out. - -New jconfig file and makefiles for Microsoft Visual C++ and Developer Studio. -Also, a jconfig file and a build script for Metrowerks CodeWarrior -on Apple Macintosh. makefile.dj has been updated for DJGPP v2, and there -are miscellaneous other minor improvements in the makefiles. - -jmemmac.c now knows how to create temporary files following Mac System 7 -conventions. - -djpeg's -map switch is now able to read raw-format PPM files reliably. - -cjpeg -progressive -restart no longer generates any unnecessary DRI markers. - -Multiple calls to jpeg_simple_progression for a single JPEG object -no longer leak memory. - - -Version 6a 7-Feb-96 --------------------- - -Library initialization sequence modified to detect version mismatches -and struct field packing mismatches between library and calling application. -This change requires applications to be recompiled, but does not require -any application source code change. - -All routine declarations changed to the style "GLOBAL(type) name ...", -that is, GLOBAL, LOCAL, METHODDEF, EXTERN are now macros taking the -routine's return type as an argument. This makes it possible to add -Microsoft-style linkage keywords to all the routines by changing just -these macros. Note that any application code that was using these macros -will have to be changed. - -DCT coefficient quantization tables are now stored in normal array order -rather than zigzag order. Application code that calls jpeg_add_quant_table, -or otherwise manipulates quantization tables directly, will need to be -changed. If you need to make such code work with either older or newer -versions of the library, a test like "#if JPEG_LIB_VERSION >= 61" is -recommended. - -djpeg's trace capability now dumps DQT tables in natural order, not zigzag -order. This allows the trace output to be made into a "-qtables" file -more easily. - -New system-dependent memory manager module for use on Apple Macintosh. - -Fix bug in cjpeg's -smooth option: last one or two scanlines would be -duplicates of the prior line unless the image height mod 16 was 1 or 2. - -Repair minor problems in VMS, BCC, MC6 makefiles. - -New configure script based on latest GNU Autoconf. - -Correct the list of include files needed by MetroWerks C for ccommand(). - -Numerous small documentation updates. - - -Version 6 2-Aug-95 -------------------- - -Progressive JPEG support: library can read and write full progressive JPEG -files. A "buffered image" mode supports incremental decoding for on-the-fly -display of progressive images. Simply recompiling an existing IJG-v5-based -decoder with v6 should allow it to read progressive files, though of course -without any special progressive display. - -New "jpegtran" application performs lossless transcoding between different -JPEG formats; primarily, it can be used to convert baseline to progressive -JPEG and vice versa. In support of jpegtran, the library now allows lossless -reading and writing of JPEG files as DCT coefficient arrays. This ability -may be of use in other applications. - -Notes for programmers: -* We changed jpeg_start_decompress() to be able to suspend; this makes all -decoding modes available to suspending-input applications. However, -existing applications that use suspending input will need to be changed -to check the return value from jpeg_start_decompress(). You don't need to -do anything if you don't use a suspending data source. -* We changed the interface to the virtual array routines: access_virt_array -routines now take a count of the number of rows to access this time. The -last parameter to request_virt_array routines is now interpreted as the -maximum number of rows that may be accessed at once, but not necessarily -the height of every access. - - -Version 5b 15-Mar-95 ---------------------- - -Correct bugs with grayscale images having v_samp_factor > 1. - -jpeg_write_raw_data() now supports output suspension. - -Correct bugs in "configure" script for case of compiling in -a directory other than the one containing the source files. - -Repair bug in jquant1.c: sometimes didn't use as many colors as it could. - -Borland C makefile and jconfig file work under either MS-DOS or OS/2. - -Miscellaneous improvements to documentation. - - -Version 5a 7-Dec-94 --------------------- - -Changed color conversion roundoff behavior so that grayscale values are -represented exactly. (This causes test image files to change.) - -Make ordered dither use 16x16 instead of 4x4 pattern for a small quality -improvement. - -New configure script based on latest GNU Autoconf. -Fix configure script to handle CFLAGS correctly. -Rename *.auto files to *.cfg, so that configure script still works if -file names have been truncated for DOS. - -Fix bug in rdbmp.c: didn't allow for extra data between header and image. - -Modify rdppm.c/wrppm.c to handle 2-byte raw PPM/PGM formats for 12-bit data. - -Fix several bugs in rdrle.c. - -NEED_SHORT_EXTERNAL_NAMES option was broken. - -Revise jerror.h/jerror.c for more flexibility in message table. - -Repair oversight in jmemname.c NO_MKTEMP case: file could be there -but unreadable. - - -Version 5 24-Sep-94 --------------------- - -Version 5 represents a nearly complete redesign and rewrite of the IJG -software. Major user-visible changes include: - * Automatic configuration simplifies installation for most Unix systems. - * A range of speed vs. image quality tradeoffs are supported. - This includes resizing of an image during decompression: scaling down - by a factor of 1/2, 1/4, or 1/8 is handled very efficiently. - * New programs rdjpgcom and wrjpgcom allow insertion and extraction - of text comments in a JPEG file. - -The application programmer's interface to the library has changed completely. -Notable improvements include: - * We have eliminated the use of callback routines for handling the - uncompressed image data. The application now sees the library as a - set of routines that it calls to read or write image data on a - scanline-by-scanline basis. - * The application image data is represented in a conventional interleaved- - pixel format, rather than as a separate array for each color channel. - This can save a copying step in many programs. - * The handling of compressed data has been cleaned up: the application can - supply routines to source or sink the compressed data. It is possible to - suspend processing on source/sink buffer overrun, although this is not - supported in all operating modes. - * All static state has been eliminated from the library, so that multiple - instances of compression or decompression can be active concurrently. - * JPEG abbreviated datastream formats are supported, ie, quantization and - Huffman tables can be stored separately from the image data. - * And not only that, but the documentation of the library has improved - considerably! - - -The last widely used release before the version 5 rewrite was version 4A of -18-Feb-93. Change logs before that point have been discarded, since they -are not of much interest after the rewrite. diff --git a/test/monniaux/jpeg-6b/make.log b/test/monniaux/jpeg-6b/make.log deleted file mode 100644 index 57897d28..00000000 --- a/test/monniaux/jpeg-6b/make.log +++ /dev/null @@ -1,41 +0,0 @@ -./ccomp.sh -DNO_DOUBLE -DNO_32BIT_DIVISION -DNO_FLOAT -DNO_SWITCH -DTAIL_CALL_MISSING -I. -c -o rdbmp.o rdbmp.c -./ccomp.sh -DNO_DOUBLE -DNO_32BIT_DIVISION -DNO_FLOAT -DNO_SWITCH -DTAIL_CALL_MISSING -I. -c -o rdswitch.o rdswitch.c -./ccomp.sh -DNO_DOUBLE -DNO_32BIT_DIVISION -DNO_FLOAT -DNO_SWITCH -DTAIL_CALL_MISSING -I. -c -o cdjpeg.o cdjpeg.c -./ccomp.sh -o cjpeg cjpeg.o rdppm.o rdgif.o rdtarga.o rdrle.o rdbmp.o rdswitch.o cdjpeg.o libjpeg.a -rdppm.o: In function `start_input_ppm': -(.text+0xc9c): undefined reference to `__compcert_i64_sdiv' -libjpeg.a(jcparam.o): In function `jpeg_quality_scaling': -(.text+0x254): undefined reference to `__compcert_i64_sdiv' -libjpeg.a(jcmaster.o): In function `per_scan_setup': -(.text+0x270): undefined reference to `__compcert_i64_smod' -libjpeg.a(jcmaster.o): In function `per_scan_setup': -(.text+0x294): undefined reference to `__compcert_i64_smod' -libjpeg.a(jcmaster.o): In function `per_scan_setup': -(.text+0x360): undefined reference to `__compcert_i64_smod' -libjpeg.a(jcprepct.o): In function `jinit_c_prep_controller': -(.text+0x66c): undefined reference to `__compcert_i64_sdiv' -libjpeg.a(jcprepct.o): In function `jinit_c_prep_controller': -(.text+0x750): undefined reference to `__compcert_i64_sdiv' -libjpeg.a(jccoefct.o): In function `compress_first_pass': -(.text+0x558): undefined reference to `__compcert_i64_sdiv' -libjpeg.a(jccoefct.o): In function `compress_first_pass': -(.text+0x580): undefined reference to `__compcert_i64_sdiv' -libjpeg.a(jccoefct.o): In function `compress_first_pass': -(.text+0x654): undefined reference to `__compcert_i64_sdiv' -libjpeg.a(jcsample.o):(.text+0x200): more undefined references to `__compcert_i64_sdiv' follow -libjpeg.a(jmemmgr.o): In function `alloc_sarray': -(.text+0x3b8): undefined reference to `__compcert_i64_udiv' -libjpeg.a(jmemmgr.o): In function `alloc_barray': -(.text+0x50c): undefined reference to `__compcert_i64_udiv' -libjpeg.a(jmemmgr.o): In function `realize_virt_arrays': -(.text+0x8d4): undefined reference to `__compcert_i64_sdiv' -libjpeg.a(jmemmgr.o): In function `realize_virt_arrays': -(.text+0x918): undefined reference to `__compcert_i64_sdiv' -libjpeg.a(jmemmgr.o): In function `realize_virt_arrays': -(.text+0x9cc): undefined reference to `__compcert_i64_sdiv' -collect2: error: ld returned 1 exit status -ccomp: error: linker command failed with exit code 1 (use -v to see invocation) - -1 error detected. -Makefile:177: recipe for target 'cjpeg' failed -make: *** [cjpeg] Error 2 diff --git a/test/monniaux/mod_int_mat/Makefile b/test/monniaux/mod_int_mat/Makefile index b285c03c..f904c1e4 100644 --- a/test/monniaux/mod_int_mat/Makefile +++ b/test/monniaux/mod_int_mat/Makefile @@ -2,7 +2,7 @@ CFLAGS=-Wall -O3 K1C_CC=k1-mbr-gcc K1C_CFLAGS=-Wall -O3 -std=c99 K1C_CCOMP=../../../ccomp -K1C_CCOMPFLAGS=-Wall -O3 -D__thread= -D__int128=int +K1C_CCOMPFLAGS=-Wall -O3 PRODUCTS=int_mat.host int_mat.gcc.k1c.out int_mat.ccomp.k1c.out int_mat.ccomp.k1c.s int_mat.gcc.k1c.s int_mat.gcc.k1c int_mat.ccomp.k1c diff --git a/test/monniaux/quicksort/Makefile b/test/monniaux/quicksort/Makefile index 683fbc90..cb9c4761 100644 --- a/test/monniaux/quicksort/Makefile +++ b/test/monniaux/quicksort/Makefile @@ -2,7 +2,7 @@ CFLAGS=-Wall -O3 K1C_CC=k1-mbr-gcc K1C_CFLAGS=-Wall -O3 -std=c99 K1C_CCOMP=../../../ccomp -K1C_CCOMPFLAGS=-Wall -O3 -D__thread= -D__int128=int +K1C_CCOMPFLAGS=-Wall -O3 PRODUCTS=quicksort.host quicksort.gcc.k1c.out quicksort.ccomp.k1c.out quicksort.ccomp.k1c.s quicksort.gcc.k1c.s quicksort.gcc.k1c quicksort.ccomp.k1c diff --git a/test/monniaux/sha-2/Makefile b/test/monniaux/sha-2/Makefile index 2904b77d..eb878cd3 100644 --- a/test/monniaux/sha-2/Makefile +++ b/test/monniaux/sha-2/Makefile @@ -2,7 +2,7 @@ CFLAGS=-Wall -O3 K1C_CC=k1-mbr-gcc K1C_CFLAGS=-Wall -O3 -std=c99 K1C_CCOMP=../../../ccomp -K1C_CCOMPFLAGS=-Wall -O3 -D__thread= -D__int128=int +K1C_CCOMPFLAGS=-Wall -O3 PRODUCTS=sha-256.host sha-256.gcc.k1c.out sha-256.ccomp.k1c.out sha-256.ccomp.k1c.s sha-256.gcc.k1c.s sha-256.gcc.k1c sha-256.ccomp.k1c diff --git a/test/monniaux/tiny-AES-c/Makefile b/test/monniaux/tiny-AES-c/Makefile index 7b9122eb..c369e40f 100644 --- a/test/monniaux/tiny-AES-c/Makefile +++ b/test/monniaux/tiny-AES-c/Makefile @@ -5,8 +5,8 @@ CC = ../../../ccomp LD = ../../../ccomp AR = ar ARFLAGS = rcs -CFLAGS = -Wall -O3 -c -D__thread= -D__int128=int -LDFLAGS = -Wall -O3 -Wl,-Map,test.map +CFLAGS = -Wall -O3 -c +LDFLAGS = -Wall -O3 # -Wl,-Map,test.map ifdef AES192 CFLAGS += -DAES192=1 endif diff --git a/test/monniaux/uzlib/make.log b/test/monniaux/uzlib/make.log deleted file mode 100644 index 56e39658..00000000 --- a/test/monniaux/uzlib/make.log +++ /dev/null @@ -1,24 +0,0 @@ -make -C src all -make[1]: Entering directory '/home/monniaux/progs/compcert/tests/uzlib/src' -/opt/CompCert/3.4/x86_64-linux/bin/ccomp -Wall -Os -o tinflate.o -c tinflate.c -/opt/CompCert/3.4/x86_64-linux/bin/ccomp -Wall -Os -o tinfgzip.o -c tinfgzip.c -/opt/CompCert/3.4/x86_64-linux/bin/ccomp -Wall -Os -o tinfzlib.o -c tinfzlib.c -/opt/CompCert/3.4/x86_64-linux/bin/ccomp -Wall -Os -o adler32.o -c adler32.c -/opt/CompCert/3.4/x86_64-linux/bin/ccomp -Wall -Os -o crc32.o -c crc32.c -/opt/CompCert/3.4/x86_64-linux/bin/ccomp -Wall -Os -o defl_static.o -c defl_static.c -/opt/CompCert/3.4/x86_64-linux/bin/ccomp -Wall -Os -o genlz77.o -c genlz77.c -rm -f ../lib/libtinf.a -ar -frs ../lib/libtinf.a tinflate.o tinfgzip.o tinfzlib.o adler32.o crc32.o defl_static.o genlz77.o -ar: creating ../lib/libtinf.a -ranlib ../lib/libtinf.a -make[1]: Leaving directory '/home/monniaux/progs/compcert/tests/uzlib/src' -make -C examples/tgzip all -make[1]: Entering directory '/home/monniaux/progs/compcert/tests/uzlib/examples/tgzip' -/opt/CompCert/3.4/x86_64-linux/bin/ccomp -Wall -I../../src -Os -c tgzip.c -/opt/CompCert/3.4/x86_64-linux/bin/ccomp -Wall -I../../src -Os -s -Wl,-Map,ld.map -o tgzip tgzip.o ../../lib/libtinf.a ../../lib/libtinf.a -make[1]: Leaving directory '/home/monniaux/progs/compcert/tests/uzlib/examples/tgzip' -make -C examples/tgunzip all -make[1]: Entering directory '/home/monniaux/progs/compcert/tests/uzlib/examples/tgunzip' -/opt/CompCert/3.4/x86_64-linux/bin/ccomp -Wall -I../../src -Os -c tgunzip.c -/opt/CompCert/3.4/x86_64-linux/bin/ccomp -Wall -I../../src -Os -s -Wl,-Map,ld.map -o tgunzip tgunzip.o ../../lib/libtinf.a ../../lib/libtinf.a -make[1]: Leaving directory '/home/monniaux/progs/compcert/tests/uzlib/examples/tgunzip' -- cgit