diff options
| -rwxr-xr-x | configure | 18 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | configure.ac.pamphlet | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/interp/g-opt.boot | 37 |
5 files changed, 39 insertions, 27 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for OpenAxiom 1.3.0-2009-05-06. +# Generated by GNU Autoconf 2.60 for OpenAxiom 1.3.0-2009-05-09. # # Report bugs to <open-axiom-bugs@lists.sf.net>. # @@ -713,8 +713,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='OpenAxiom' PACKAGE_TARNAME='openaxiom' -PACKAGE_VERSION='1.3.0-2009-05-06' -PACKAGE_STRING='OpenAxiom 1.3.0-2009-05-06' +PACKAGE_VERSION='1.3.0-2009-05-09' +PACKAGE_STRING='OpenAxiom 1.3.0-2009-05-09' PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net' ac_unique_file="src/Makefile.pamphlet" @@ -1406,7 +1406,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenAxiom 1.3.0-2009-05-06 to adapt to many kinds of systems. +\`configure' configures OpenAxiom 1.3.0-2009-05-09 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1476,7 +1476,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenAxiom 1.3.0-2009-05-06:";; + short | recursive ) echo "Configuration of OpenAxiom 1.3.0-2009-05-09:";; esac cat <<\_ACEOF @@ -1580,7 +1580,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenAxiom configure 1.3.0-2009-05-06 +OpenAxiom configure 1.3.0-2009-05-09 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1594,7 +1594,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenAxiom $as_me 1.3.0-2009-05-06, which was +It was created by OpenAxiom $as_me 1.3.0-2009-05-09, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -26808,7 +26808,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by OpenAxiom $as_me 1.3.0-2009-05-06, which was +This file was extended by OpenAxiom $as_me 1.3.0-2009-05-09, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -26857,7 +26857,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OpenAxiom config.status 1.3.0-2009-05-06 +OpenAxiom config.status 1.3.0-2009-05-09 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index 8c1b631b..49745375 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.3.0-2009-05-06], +AC_INIT([OpenAxiom], [1.3.0-2009-05-09], [open-axiom-bugs@lists.sf.net]) AC_CONFIG_AUX_DIR(config) diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet index 464b12d6..57e96c86 100644 --- a/configure.ac.pamphlet +++ b/configure.ac.pamphlet @@ -1131,7 +1131,7 @@ information: <<Autoconf init>>= sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.3.0-2009-05-06], +AC_INIT([OpenAxiom], [1.3.0-2009-05-09], [open-axiom-bugs@lists.sf.net]) @ diff --git a/src/ChangeLog b/src/ChangeLog index 7760c9e6..f1c04308 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2009-05-10 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * interp/g-opt.boot (emitIndirectCall): New. + (optCall): Use it. + (optSpecialCall): Likewise. + (optSPADCALL): Tidy. + 2009-05-09 Gabriel Dos Reis <gdr@cs.tamu.edu> * algebra/term.spad.pamphlet (zero?$Arity): New. diff --git a/src/interp/g-opt.boot b/src/interp/g-opt.boot index e78ceb7a..dd8c04e0 100644 --- a/src/interp/g-opt.boot +++ b/src/interp/g-opt.boot @@ -39,6 +39,22 @@ namespace BOOT $optimizableConstructorNames := $SystemInlinableConstructorNames +--% + +++ return the template of the instantiating functor for +++ the domain form `dom'. +getDomainTemplate dom == + atom dom => nil + getInfovec first dom + +++ Emit code for an indirect call to domain-wide Spad function. +++ This is usually the case for exported functions. +emitIndirectCall(fn,args,x) == + rplac(first x, "SPADCALL") + rplac(first fn,"getShellEntry") + rplac(rest x, [:args,fn]) + x + --% OPTIMIZER optimizeFunctionDef(def) == @@ -133,10 +149,8 @@ optCatch (x is ["CATCH",g,a]) == optSPADCALL(form is ['SPADCALL,:argl]) == null $InteractiveMode => form -- last arg is function/env, but may be a form - argl is [:argl,fun] => - fun is ['ELT,dom,slot] => - optCall ['call,['ELT,dom,slot],:argl] - form + argl is [:argl,fun] and fun is ["ELT",dom,slot] => + optCall ['call,['ELT,dom,slot],:argl] form optCall (x is ["call",:u]) == @@ -150,14 +164,8 @@ optCall (x is ["call",:u]) == (RPLAC(first x,"SPADCALL"); RPLAC(rest x,[:a,name]); x) fn is [q,R,n] and MEMQ(q,'(getShellEntry ELT QREFELT CONST)) => not $bootStrapMode and (w:= optCallSpecially(q,x,n,R)) => w - q="CONST" => ---+ - ["spadConstant",R,n] - --putInLocalDomainReferences will change this to ELT or QREFELT - RPLAC(first x,"SPADCALL") - RPLACA(fn,"getShellEntry") - RPLAC(rest x,[:a,fn]) - x + q="CONST" => ["spadConstant",R,n] + emitIndirectCall(fn,a,x) systemErrorHere ["optCall",x] optCallSpecially(q,x,n,R) == @@ -211,10 +219,7 @@ optSpecialCall(x,y,n) == --DEF-EQUAL is really an optimiser x [fn,:a]:= first x - RPLAC(first x,"SPADCALL") - RPLACA(fn,"getShellEntry") - RPLAC(rest x,[:a,fn]) - x + emitIndirectCall(fn,a,x) compileTimeBindingOf u == NULL(name:= BPINAME u) => keyedSystemError("S2OO0001",[u]) |