diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | gtk-doc.make | 5 | ||||
| -rw-r--r-- | orc-pixel/README | 30 | ||||
| -rw-r--r-- | testsuite/Makefile.am | 3 | ||||
| -rw-r--r-- | testsuite/perf_parse.c | 10 |
5 files changed, 14 insertions, 35 deletions
diff --git a/configure.ac b/configure.ac index 06713bd..91ed01b 100644 --- a/configure.ac +++ b/configure.ac @@ -131,7 +131,6 @@ doc/Makefile doc/version.entities orc/Makefile orc-float/Makefile -orc-pixel/Makefile orc-test/Makefile testsuite/Makefile testsuite/orcc/Makefile diff --git a/gtk-doc.make b/gtk-doc.make index 9122d7b..49cb12a 100644 --- a/gtk-doc.make +++ b/gtk-doc.make @@ -43,7 +43,7 @@ REPORT_FILES = \ $(DOC_MODULE)-undeclared.txt \ $(DOC_MODULE)-unused.txt -CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) +CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) xml/version.entities if ENABLE_GTK_DOC all-local: html-build.stamp @@ -95,7 +95,8 @@ sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections. @-chmod -R u+w $(srcdir) cd $(srcdir) && \ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) - cp version.entities xml + mkdir -p xml/ + cp version.entities xml/ touch sgml-build.stamp sgml.stamp: sgml-build.stamp diff --git a/orc-pixel/README b/orc-pixel/README deleted file mode 100644 index 1c07142..0000000 --- a/orc-pixel/README +++ /dev/null @@ -1,30 +0,0 @@ - -orc-pixel -========= - -Orc-pixel is a quick and dirty library showing how to extend Orc -by adding opcodes and opcode rules. It implements compositing -pixel operations, or rather, it implements _one_ compositing pixel -operation, "IN". - -At some point, the x86_ functions in orcpixel-sse.c that are copied -from orc/x86.c and orc/orcrules-sse.c will be converted to exported -functions in liborc. - -The code generated by orcpixel-sse.c does not produce correct -results unless loop_shift is 0 or 1. This patch will force that to -be true: - - -diff --git a/orc/orcprogram-sse.c b/orc/orcprogram-sse.c -index 01ae501..29f8c10 100644 ---- a/orc/orcprogram-sse.c -+++ b/orc/orcprogram-sse.c -@@ -108,6 +108,7 @@ orc_compiler_sse_init (OrcCompiler *compiler) - orc_program_get_max_var_size (compiler->program)); - break; - } -+compiler->loop_shift = 1; - - //compiler->long_jumps = TRUE; - } diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am index 6e1c201..486a4a9 100644 --- a/testsuite/Makefile.am +++ b/testsuite/Makefile.am @@ -1,6 +1,9 @@ DIST_SUBDIRS = orcc +TESTS_ENVIRONMENT = \ + testfile="$(srcdir)/test.orc" + TESTS = \ test_accsadubl test-schro \ exec_opcodes_sys \ diff --git a/testsuite/perf_parse.c b/testsuite/perf_parse.c index 0c08921..7eccafe 100644 --- a/testsuite/perf_parse.c +++ b/testsuite/perf_parse.c @@ -20,7 +20,7 @@ main (int argc, char *argv[]) int n; int i; OrcProgram **programs; - const char *filename = "test.orc"; + const char *filename = NULL; orc_init (); orc_test_init (); @@ -28,9 +28,15 @@ main (int argc, char *argv[]) if (argc >= 2) { filename = argv[1]; } + if (filename == NULL) { + filename = getenv ("testfile"); + } + if (filename == NULL) { + filename = "test.orc"; + } code = read_file (filename); if (!code) { - printf("compile_parse_test <file.orc>\n"); + printf("perf_parse <file.orc>\n"); exit(1); } |