[svn:parrot] r45840 - in branches/runcore_purge: . examples/benchmarks examples/sdl examples/shootout lib/Parrot/Ops2c ports/cygwin t/examples
cotto at svn.parrot.org
cotto at svn.parrot.org
Wed Apr 21 05:33:57 UTC 2010
Author: cotto
Date: Wed Apr 21 05:33:57 2010
New Revision: 45840
URL: https://trac.parrot.org/parrot/changeset/45840
Log:
[runcore] remove some dead perl code and references to excised runcores
Modified:
branches/runcore_purge/MANIFEST.generated
branches/runcore_purge/examples/benchmarks/oo1.pir
branches/runcore_purge/examples/sdl/mandel.pir
branches/runcore_purge/examples/shootout/ack.pir
branches/runcore_purge/examples/shootout/binarytrees.pir
branches/runcore_purge/examples/shootout/fasta.pir
branches/runcore_purge/examples/shootout/partialsums.pir
branches/runcore_purge/examples/shootout/pidigits.pir
branches/runcore_purge/examples/shootout/recursive-2.pir
branches/runcore_purge/examples/shootout/recursive.pir
branches/runcore_purge/examples/shootout/takfp.pir
branches/runcore_purge/lib/Parrot/Ops2c/Utils.pm
branches/runcore_purge/ports/cygwin/README
branches/runcore_purge/t/examples/shootout.t
Modified: branches/runcore_purge/MANIFEST.generated
==============================================================================
--- branches/runcore_purge/MANIFEST.generated Wed Apr 21 05:15:51 2010 (r45839)
+++ branches/runcore_purge/MANIFEST.generated Wed Apr 21 05:33:57 2010 (r45840)
@@ -37,10 +37,7 @@
include/parrot/extend_vtable.h [main]include
include/parrot/feature.h [main]include
include/parrot/has_header.h [main]include
-include/parrot/oplib/core_ops_cg.h [main]include
-include/parrot/oplib/core_ops_cgp.h [main]include
include/parrot/oplib/core_ops.h [main]include
-include/parrot/oplib/core_ops_switch.h [main]include
include/parrot/oplib/ops.h [main]include
include/parrot/pbcversion.h [devel]include
include/parrot/platform.h [main]include
@@ -229,8 +226,6 @@
src/jit_emit.h []
src/nci.c []
src/null_config.c []
-src/ops/core_ops_cgp.c []
-src/ops/core_ops_switch.c []
src/parrot_config.c []
src/pmc/boolean.dump [devel]src
src/pmc/continuation.dump [devel]src
Modified: branches/runcore_purge/examples/benchmarks/oo1.pir
==============================================================================
--- branches/runcore_purge/examples/benchmarks/oo1.pir Wed Apr 21 05:15:51 2010 (r45839)
+++ branches/runcore_purge/examples/benchmarks/oo1.pir Wed Apr 21 05:33:57 2010 (r45840)
@@ -11,8 +11,6 @@
# python oo1.py 1.2 (first time)
# python oo1.py 0.51
-# parrot -R cgp oo1.pasm -g -O3
-
# original list fixed 4.9 (leaks mem ~ 110 M used)
# don't clone vtable 4.4
# Dan's vtable cache 4.3 3.8
@@ -31,9 +29,6 @@
# Dan's new object layout 1.00
-# parrot -R cgp oo1-prop.pasm
-# invokecc 0.75
-# RetCont out of loop 0.57
# parrot -R jit oo1-prop.pasm 0.54
.namespace [ "Foo" ]
Modified: branches/runcore_purge/examples/sdl/mandel.pir
==============================================================================
--- branches/runcore_purge/examples/sdl/mandel.pir Wed Apr 21 05:15:51 2010 (r45839)
+++ branches/runcore_purge/examples/sdl/mandel.pir Wed Apr 21 05:33:57 2010 (r45840)
@@ -556,9 +556,7 @@
Optimized build
[2] plain runcore 64 bit 3.0s
- [2] -R cgp runcore 64 bit 1.5s
[2] plain runcore 32 bit 3.6s
- [2] -R cgp runcore 32 bit 1.6s
[1] -R jit 1.1s
[2] -R jit 0.8s
[3] -R jit 0.5s
Modified: branches/runcore_purge/examples/shootout/ack.pir
==============================================================================
--- branches/runcore_purge/examples/shootout/ack.pir Wed Apr 21 05:15:51 2010 (r45839)
+++ branches/runcore_purge/examples/shootout/ack.pir Wed Apr 21 05:33:57 2010 (r45840)
@@ -3,7 +3,7 @@
# $Id$
# OUTPUT="Ack(3, 9) = 4093\n"
#
-# ./parrot -Oc -R cgp-jit
+# ./parrot -Oc
# RQ (Karl)
# Seems to be an old benchmark, now deprecated by the shootout
#
Modified: branches/runcore_purge/examples/shootout/binarytrees.pir
==============================================================================
--- branches/runcore_purge/examples/shootout/binarytrees.pir Wed Apr 21 05:15:51 2010 (r45839)
+++ branches/runcore_purge/examples/shootout/binarytrees.pir Wed Apr 21 05:33:57 2010 (r45840)
@@ -1,4 +1,4 @@
-#!./parrot -R cgp
+#!./parrot
# Copyright (C) 2005-2009, Parrot Foundation.
# $Id$
#
Modified: branches/runcore_purge/examples/shootout/fasta.pir
==============================================================================
--- branches/runcore_purge/examples/shootout/fasta.pir Wed Apr 21 05:15:51 2010 (r45839)
+++ branches/runcore_purge/examples/shootout/fasta.pir Wed Apr 21 05:33:57 2010 (r45840)
@@ -1,4 +1,4 @@
-#!./parrot -R cgp
+#!./parrot
# Copyright (C) 2005-2009, Parrot Foundation.
# $Id$
#
Modified: branches/runcore_purge/examples/shootout/partialsums.pir
==============================================================================
--- branches/runcore_purge/examples/shootout/partialsums.pir Wed Apr 21 05:15:51 2010 (r45839)
+++ branches/runcore_purge/examples/shootout/partialsums.pir Wed Apr 21 05:33:57 2010 (r45840)
@@ -1,4 +1,4 @@
-#!./parrot -R cgp
+#!./parrot
# Copyright (C) 2006-2009, Parrot Foundation.
# $Id$
#
Modified: branches/runcore_purge/examples/shootout/pidigits.pir
==============================================================================
--- branches/runcore_purge/examples/shootout/pidigits.pir Wed Apr 21 05:15:51 2010 (r45839)
+++ branches/runcore_purge/examples/shootout/pidigits.pir Wed Apr 21 05:33:57 2010 (r45840)
@@ -1,4 +1,4 @@
-#!./parrot -R cgp
+#!./parrot
# Copyright (C) 2005-2009, Parrot Foundation.
# $Id$
#
Modified: branches/runcore_purge/examples/shootout/recursive-2.pir
==============================================================================
--- branches/runcore_purge/examples/shootout/recursive-2.pir Wed Apr 21 05:15:51 2010 (r45839)
+++ branches/runcore_purge/examples/shootout/recursive-2.pir Wed Apr 21 05:33:57 2010 (r45840)
@@ -6,7 +6,7 @@
# Fib and Tak by Joshua Isom
# use less registers (leo)
-# time ./parrot -Oc -R cgp-jit recursive-2.pir 11
+# time ./parrot -Oc recursive-2.pir 11
# real 2.32 s (AMD X2 at 2000)
# modified default value to n=3. Karl Forner
Modified: branches/runcore_purge/examples/shootout/recursive.pir
==============================================================================
--- branches/runcore_purge/examples/shootout/recursive.pir Wed Apr 21 05:15:51 2010 (r45839)
+++ branches/runcore_purge/examples/shootout/recursive.pir Wed Apr 21 05:33:57 2010 (r45840)
@@ -5,7 +5,7 @@
# Ack by Leopold Toetsch
# Fib and Tak by Joshua Isom
# modified default value to n=3. Karl Forner
-# ./parrot -Oc -R cgp-jit recursive.pir N
+# ./parrot -Oc recursive.pir N
.sub main :main
.param pmc argv
Modified: branches/runcore_purge/examples/shootout/takfp.pir
==============================================================================
--- branches/runcore_purge/examples/shootout/takfp.pir Wed Apr 21 05:15:51 2010 (r45839)
+++ branches/runcore_purge/examples/shootout/takfp.pir Wed Apr 21 05:33:57 2010 (r45840)
@@ -1,8 +1,8 @@
-#!./parrot -R cgp
+#!./parrot
# Copyright (C) 2005-2009, Parrot Foundation.
# $Id$
#
-# ./parrot -R cgp takfp.pir N (N = 10 for shootout)
+# ./parrot takfp.pir N (N = 10 for shootout)
# by Joshua Isom
# changed default value to N=7 (shootout default before being deprecated)
# anyway N=10 froze my laptop. Karl Forner
Modified: branches/runcore_purge/lib/Parrot/Ops2c/Utils.pm
==============================================================================
--- branches/runcore_purge/lib/Parrot/Ops2c/Utils.pm Wed Apr 21 05:15:51 2010 (r45839)
+++ branches/runcore_purge/lib/Parrot/Ops2c/Utils.pm Wed Apr 21 05:33:57 2010 (r45840)
@@ -372,10 +372,6 @@
$self->_print_run_core_func_decl_source($SOURCE);
- $self->_print_cg_jump_table($SOURCE);
-
- $self->_print_goto_opcode($SOURCE);
-
$self->_print_op_function_definitions($SOURCE);
}
@@ -650,7 +646,6 @@
$one_op .= "$definition $comment {\n$src}\n\n";
push @op_funcs, $one_op;
push @op_protos, $prototype;
- $prev_src = $src if ( $self->{suffix} eq '_cgp' || $self->{suffix} eq '_switch' );
$prev_index = $index;
}
$index++;
@@ -662,47 +657,6 @@
$self->{cg_jump_table} = \@cg_jump_table;
}
-sub _print_cg_jump_table {
- my ( $self, $fh ) = @_;
-
- my @cg_jump_table = @{ $self->{cg_jump_table} };
-
- if ( $self->{suffix} =~ /cg/ ) {
- print $fh @cg_jump_table;
- print $fh <<END_C;
- NULL
- };
-END_C
- print $fh $self->{trans}->run_core_after_addr_table( $self->{bs} );
- }
- return 1;
-}
-
-sub _print_goto_opcode {
- my ( $self, $fh ) = @_;
-
- if ( $self->{suffix} =~ /cgp/ ) {
- print $fh <<END_C;
-#ifdef __GNUC__
-# ifdef I386
- else if (cur_opcode == (opcode_t *)(void **) 1)
- __asm__ ("jmp *4(%ebp)"); /* jump to ret addr, used by JIT */
-# endif
-#endif
- _reg_base = (char*)Parrot_pcc_get_regs_ni(interp, CURRENT_CONTEXT(interp))->regs_i;
- goto **(void **)cur_opcode;
-
-END_C
- }
- elsif ( $self->{suffix} =~ /cg/ ) {
- print $fh <<END_C;
-goto *$self->{bs}ops_addr[*cur_opcode];
-
-END_C
- }
- return 1;
-}
-
sub _print_op_function_definitions {
my ( $self, $fh ) = @_;
Modified: branches/runcore_purge/ports/cygwin/README
==============================================================================
--- branches/runcore_purge/ports/cygwin/README Wed Apr 21 05:15:51 2010 (r45839)
+++ branches/runcore_purge/ports/cygwin/README Wed Apr 21 05:33:57 2010 (r45840)
@@ -682,9 +682,6 @@
/usr/include/parrot/1.0.0/parrot/op.h
/usr/include/parrot/1.0.0/parrot/oplib.h
/usr/include/parrot/1.0.0/parrot/oplib/core_ops.h
- /usr/include/parrot/1.0.0/parrot/oplib/core_ops_cg.h
- /usr/include/parrot/1.0.0/parrot/oplib/core_ops_cgp.h
- /usr/include/parrot/1.0.0/parrot/oplib/core_ops_switch.h
/usr/include/parrot/1.0.0/parrot/oplib/ops.h
/usr/include/parrot/1.0.0/parrot/packfile.h
/usr/include/parrot/1.0.0/parrot/parrot.h
@@ -748,8 +745,6 @@
/usr/lib/parrot/1.0.0/src/install_config.o
/usr/lib/parrot/1.0.0/src/nci.c
/usr/lib/parrot/1.0.0/src/null_config.o
- /usr/lib/parrot/1.0.0/src/ops/core_ops_cgp.c
- /usr/lib/parrot/1.0.0/src/ops/core_ops_switch.c
/usr/lib/parrot/1.0.0/src/parrot_config.o
/usr/lib/parrot/1.0.0/tools/build/ops2c.pl
/usr/lib/parrot/1.0.0/tools/build/pmc2c.pl
Modified: branches/runcore_purge/t/examples/shootout.t
==============================================================================
--- branches/runcore_purge/t/examples/shootout.t Wed Apr 21 05:15:51 2010 (r45839)
+++ branches/runcore_purge/t/examples/shootout.t Wed Apr 21 05:33:57 2010 (r45840)
@@ -35,7 +35,7 @@
To add a new test, you do not have to modify this script:
1. add your script (toto.pir) to examples/shootout
- 2. put parrot options in the first line (e.g "#!./parrot -Oc -R cgp-jit")
+ 2. put parrot options in the first line (e.g "#!./parrot -Oc")
3. make sure you have default argument values
4. put the expected output as a file : toto.pir_output
5. if you need an input file (to be read from stdin), call it toto.pir_input
More information about the parrot-commits
mailing list