Index: t/op/arithmetics_pmc.t
===================================================================
--- t/op/arithmetics_pmc.t	(revision 41853)
+++ t/op/arithmetics_pmc.t	(working copy)
@@ -1,17 +1,7 @@
-#!perl
+#! parrot
 # Copyright (C) 2001-2009, Parrot Foundation.
 # $Id$
 
-use strict;
-use warnings;
-use lib qw( . lib ../lib ../../lib );
-
-use Test::More;
-use Parrot::Test;
-
-# test for GMP
-use Parrot::Config;
-
 =head1 NAME
 
 t/op/arithmetics_pmc.t - Arithmetic Ops involving PMCs
@@ -26,84 +16,636 @@
 
 =cut
 
-# We don't check BigInt and BigNum ops
-if ( $PConfig{gmp} ) {
-    plan tests => 68;
-}
-else {
-    plan tests => 34;
-}
+.sub main :main
+    .include 'test_more.pir'
+    .include "iglobals.pasm"
 
+    plan(68)
 
-# Map vtable method to op
-my %methods = qw{
-    add             add
-    subtract        sub
-    multiply        mul
-    divide          div
+    # Don't check BigInt or BigNum without gmp
+    .local pmc interp     # a handle to our interpreter object.
+    interp = getinterp
+    .local pmc config
+    config = interp[.IGLOBALS_CONFIG_HASH]
+    .local int gmp
+    gmp = config['gmp']
 
-    floor_divide    fdiv
-    modulus         mod
-    pow             pow
+    run_tests_for('Integer')
+    run_tests_for('Float')
 
-    bitwise_or      bor
-    bitwise_and     band
-    bitwise_xor     bxor
+    if gmp goto do_big_ones
+        skip( 34, "will not test BigInt or BigNum without gmp" )
+        goto end   
 
-    bitwise_shr     shr
-    bitwise_shl     shl
-    bitwise_lsr     lsr
+  do_big_ones:
+    run_tests_for('BigInt')
+    run_tests_for('BigNum')
 
-    concatenate     concat
+  end:
+.end
 
-    logical_or      or
-    logical_and     and
-    logical_xor     xor
-};
+.sub run_tests_for
+    .param pmc type
+    test_add(type)
+    test_divide(type)
+    test_multiply(type)
+    test_floor_divide(type)
+    test_logical_and(type)
+    test_concatenate(type)
+    test_logical_xor(type)
+    test_logical_or(type)
+    test_bitwise_shr(type)
+    test_bitwise_or(type)
+    test_bitwise_shl(type)
+    test_bitwise_xor(type)
+    test_modulus(type)
+    test_pow(type)
+    test_subtract(type)
+    test_bitwise_lsr(type)
+    test_bitwise_and(type)
+.end
 
-# XXX Put BigInt and BigNum here
-my @pmcs = qw{
-    Integer Float
-};
+.sub test_add
+    .param pmc type
 
-if ($PConfig{gmp}) {
-    push @pmcs, qw{ BigInt BigNum};
-}
+    $P0 = new type
+    $P0 = 40
+    $P1 = new type
+    $P1 = 2
+    $P2 = new type
+    $P2 = 115200
 
-foreach my $pmc (@pmcs) {
-    while(my($vtable, $op) = each(%methods)) {
+    $P99 = $P2
 
-# We should generate more tests for all possible combinations
-pir_output_is( <<"CODE", <<OUTPUT, "Original dest is untouched in $pmc.$vtable " );
-.sub 'test' :main
-    \$P0 = new '$pmc'
-    \$P0 = 40
-    \$P1 = new '$pmc'
-    \$P1 = 2
-    \$P2 = new '$pmc'
-    \$P2 = 115200
+    $S0 = "original dest is untouched in add for "
+    $S1 = type
+    concat $S0, $S1
 
-    \$P99 = \$P2
     # ignore exceptions
     push_eh done
-    $op \$P2, \$P0, \$P1
+    add $P2, $P0, $P1
 
-    \$I0 = cmp \$P99, 115200
-    unless \$I0 goto done
-    print " not "
+    $I0 = cmp $P99, 115200
+    
+    is( $I0, 0, $S0 )
+    goto end
+
   done:
-    say "ok"
+    ok(1, 'ignoring exceptions')
+  end:
 .end
-CODE
-ok
-OUTPUT
 
-    }
-}
+.sub test_divide
+    .param pmc type
 
+    $P0 = new type
+    $P0 = 40
+    $P1 = new type
+    $P1 = 2
+    $P2 = new type
+    $P2 = 115200
+
+    $P99 = $P2
+
+    $S0 = "original dest is untouched in divide for "
+    $S1 = type
+    concat $S0, $S1
+
+    # ignore exceptions
+    push_eh done
+    div $P2, $P0, $P1
+
+    $I0 = cmp $P99, 115200
+    
+    is( $I0, 0, $S0 )
+    goto end
+
+  done:
+    ok(1, 'ignoring exceptions')
+  end:
+.end
+
+.sub test_multiply
+    .param pmc type
+
+    $P0 = new type
+    $P0 = 40
+    $P1 = new type
+    $P1 = 2
+    $P2 = new type
+    $P2 = 115200
+
+    $P99 = $P2
+
+    $S0 = "original dest is untouched in multiply for "
+    $S1 = type
+    concat $S0, $S1
+
+    # ignore exceptions
+    push_eh done
+    mul $P2, $P0, $P1
+
+    $I0 = cmp $P99, 115200
+    
+    is( $I0, 0, $S0 )
+    goto end
+
+  done:
+    ok(1, 'ignoring exceptions')
+  end:
+.end
+
+.sub test_floor_divide
+    .param pmc type
+
+    $P0 = new type
+    $P0 = 40
+    $P1 = new type
+    $P1 = 2
+    $P2 = new type
+    $P2 = 115200
+
+    $P99 = $P2
+
+    $S0 = "original dest is untouched in floor_divide for "
+    $S1 = type
+    concat $S0, $S1
+
+    # ignore exceptions
+    push_eh done
+    fdiv $P2, $P0, $P1
+
+    $I0 = cmp $P99, 115200
+    
+    is( $I0, 0, $S0 )
+    goto end
+
+  done:
+    ok(1, 'ignoring exceptions')
+  end:
+.end
+
+.sub test_logical_and
+    .param pmc type
+
+    $P0 = new type
+    $P0 = 40
+    $P1 = new type
+    $P1 = 2
+    $P2 = new type
+    $P2 = 115200
+
+    $P99 = $P2
+
+    $S0 = "original dest is untouched in logical_and for "
+    $S1 = type
+    concat $S0, $S1
+
+    # ignore exceptions
+    push_eh done
+    and $P2, $P0, $P1
+
+    $I0 = cmp $P99, 115200
+    
+    is( $I0, 0, $S0 )
+    goto end
+
+  done:
+    ok(1, 'ignoring exceptions')
+  end:
+.end
+
+.sub test_concatenate
+    .param pmc type
+
+    $P0 = new type
+    $P0 = 40
+    $P1 = new type
+    $P1 = 2
+    $P2 = new type
+    $P2 = 115200
+
+    $P99 = $P2
+
+    $S0 = "original dest is untouched in concatenate for "
+    $S1 = type
+    concat $S0, $S1
+
+    # ignore exceptions
+    push_eh done
+    concat $P2, $P0, $P1
+
+    $I0 = cmp $P99, 115200
+    
+    is( $I0, 0, $S0 )
+    goto end
+
+  done:
+    ok(1, 'ignoring exceptions')
+  end:
+.end
+
+.sub test_logical_xor
+    .param pmc type
+
+    $P0 = new type
+    $P0 = 40
+    $P1 = new type
+    $P1 = 2
+    $P2 = new type
+    $P2 = 115200
+
+    $P99 = $P2
+
+    $S0 = "original dest is untouched in logical_xor for "
+    $S1 = type
+    concat $S0, $S1
+
+    # ignore exceptions
+    push_eh done
+    xor $P2, $P0, $P1
+
+    $I0 = cmp $P99, 115200
+    
+    is( $I0, 0, $S0 )
+    goto end
+
+  done:
+    ok(1, 'ignoring exceptions')
+  end:
+.end
+
+.sub test_logical_or
+    .param pmc type
+
+    $P0 = new type
+    $P0 = 40
+    $P1 = new type
+    $P1 = 2
+    $P2 = new type
+    $P2 = 115200
+
+    $P99 = $P2
+
+    $S0 = "original dest is untouched in logical_or for "
+    $S1 = type
+    concat $S0, $S1
+
+    # ignore exceptions
+    push_eh done
+    or $P2, $P0, $P1
+
+    $I0 = cmp $P99, 115200
+    
+    is( $I0, 0, $S0 )
+    goto end
+
+  done:
+    ok(1, 'ignoring exceptions')
+  end:
+.end
+
+.sub test_bitwise_shr
+    .param pmc type
+
+    $P0 = new type
+    $P0 = 40
+    $P1 = new type
+    $P1 = 2
+    $P2 = new type
+    $P2 = 115200
+
+    $P99 = $P2
+
+    $S0 = "original dest is untouched in bitwise_shr for "
+    $S1 = type
+    concat $S0, $S1
+
+    # ignore exceptions
+    push_eh done
+    shr $P2, $P0, $P1
+
+    $I0 = cmp $P99, 115200
+    
+    is( $I0, 0, $S0 )
+    goto end
+
+  done:
+    ok(1, 'ignoring exceptions')
+  end:
+.end
+
+.sub test_bitwise_or
+    .param pmc type
+
+    $P0 = new type
+    $P0 = 40
+    $P1 = new type
+    $P1 = 2
+    $P2 = new type
+    $P2 = 115200
+
+    $P99 = $P2
+
+    $S0 = "original dest is untouched in bitwise_or for "
+    $S1 = type
+    concat $S0, $S1
+
+    # ignore exceptions
+    push_eh done
+    bor $P2, $P0, $P1
+
+    $I0 = cmp $P99, 115200
+    
+    is( $I0, 0, $S0 )
+    goto end
+
+  done:
+    ok(1, 'ignoring exceptions')
+  end:
+.end
+
+.sub test_bitwise_shl
+    .param pmc type
+
+    $P0 = new type
+    $P0 = 40
+    $P1 = new type
+    $P1 = 2
+    $P2 = new type
+    $P2 = 115200
+
+    $P99 = $P2
+
+    $S0 = "original dest is untouched in bitwise_shl for "
+    $S1 = type
+    concat $S0, $S1
+
+    # ignore exceptions
+    push_eh done
+    shl $P2, $P0, $P1
+
+    $I0 = cmp $P99, 115200
+    
+    is( $I0, 0, $S0 )
+    goto end
+
+  done:
+    ok(1, 'ignoring exceptions')
+  end:
+.end
+
+.sub test_bitwise_xor
+    .param pmc type
+
+    $P0 = new type
+    $P0 = 40
+    $P1 = new type
+    $P1 = 2
+    $P2 = new type
+    $P2 = 115200
+
+    $P99 = $P2
+
+    $S0 = "original dest is untouched in bitwise_xor for "
+    $S1 = type
+    concat $S0, $S1
+
+    # ignore exceptions
+    push_eh done
+    bxor $P2, $P0, $P1
+
+    $I0 = cmp $P99, 115200
+    
+    is( $I0, 0, $S0 )
+    goto end
+
+  done:
+    ok(1, 'ignoring exceptions')
+  end:
+.end
+
+.sub test_modulus
+    .param pmc type
+
+    $P0 = new type
+    $P0 = 40
+    $P1 = new type
+    $P1 = 2
+    $P2 = new type
+    $P2 = 115200
+
+    $P99 = $P2
+
+    $S0 = "original dest is untouched in modulus for "
+    $S1 = type
+    concat $S0, $S1
+
+    # ignore exceptions
+    push_eh done
+    mod $P2, $P0, $P1
+
+    $I0 = cmp $P99, 115200
+    
+    is( $I0, 0, $S0 )
+    goto end
+
+  done:
+    ok(1, 'ignoring exceptions')
+  end:
+.end
+
+.sub test_pow
+    .param pmc type
+
+    $P0 = new type
+    $P0 = 40
+    $P1 = new type
+    $P1 = 2
+    $P2 = new type
+    $P2 = 115200
+
+    $P99 = $P2
+
+    $S0 = "original dest is untouched in pow for "
+    $S1 = type
+    concat $S0, $S1
+
+    # ignore exceptions
+    push_eh done
+    pow $P2, $P0, $P1
+
+    $I0 = cmp $P99, 115200
+    
+    is( $I0, 0, $S0 )
+    goto end
+
+  done:
+    ok(1, 'ignoring exceptions')
+  end:
+.end
+
+.sub test_subtract
+    .param pmc type
+
+    $P0 = new type
+    $P0 = 40
+    $P1 = new type
+    $P1 = 2
+    $P2 = new type
+    $P2 = 115200
+
+    $P99 = $P2
+
+    $S0 = "original dest is untouched in subtract for "
+    $S1 = type
+    concat $S0, $S1
+
+    # ignore exceptions
+    push_eh done
+    sub $P2, $P0, $P1
+
+    $I0 = cmp $P99, 115200
+    
+    is( $I0, 0, $S0 )
+    goto end
+
+  done:
+    ok(1, 'ignoring exceptions')
+  end:
+.end
+
+.sub test_bitwise_lsr
+    .param pmc type
+
+    $P0 = new type
+    $P0 = 40
+    $P1 = new type
+    $P1 = 2
+    $P2 = new type
+    $P2 = 115200
+
+    $P99 = $P2
+
+    $S0 = "original dest is untouched in bitwise_lsr for "
+    $S1 = type
+    concat $S0, $S1
+
+    # ignore exceptions
+    push_eh done
+    lsr $P2, $P0, $P1
+
+    $I0 = cmp $P99, 115200
+    
+    is( $I0, 0, $S0 )
+    goto end
+
+  done:
+    ok(1, 'ignoring exceptions')
+  end:
+.end
+
+.sub test_bitwise_and
+    .param pmc type
+
+    $P0 = new type
+    $P0 = 40
+    $P1 = new type
+    $P1 = 2
+    $P2 = new type
+    $P2 = 115200
+
+    $P99 = $P2
+
+    $S0 = "original dest is untouched in bitwise_and for "
+    $S1 = type
+    concat $S0, $S1
+
+    # ignore exceptions
+    push_eh done
+    band $P2, $P0, $P1
+
+    $I0 = cmp $P99, 115200
+    
+    is( $I0, 0, $S0 )
+    goto end
+
+  done:
+    ok(1, 'ignoring exceptions')
+  end:
+.end
+
+## Perl code used to generate above tests:
+# #!/usr/bin/env perl
+# 
+# # We should generate more tests for all possible combinations
+# # Map vtable method to op
+# my %methods = qw{
+#     add             add
+#     subtract        sub
+#     multiply        mul
+#     divide          div
+# 
+#     floor_divide    fdiv
+#     modulus         mod
+#     pow             pow
+# 
+#     bitwise_or      bor
+#     bitwise_and     band
+#     bitwise_xor     bxor
+# 
+#     bitwise_shr     shr
+#     bitwise_shl     shl
+#     bitwise_lsr     lsr
+# 
+#     concatenate     concat
+# 
+#     logical_or      or
+#     logical_and     and
+#     logical_xor     xor
+# };
+# 
+# # foreach my $pmc (@pmcs) {
+# while(my($vtable, $op) = each(%methods)) {
+# 
+# print <<"END";
+# .sub test_$vtable
+#     .param pmc type
+# 
+#     \$P0 = new type
+#     \$P0 = 40
+#     \$P1 = new type
+#     \$P1 = 2
+#     \$P2 = new type
+#     \$P2 = 115200
+# 
+#     \$P99 = \$P2
+# 
+#     \$S0 = "original dest is untouched in $vtable for "
+#     \$S1 = type
+#     concat \$S0, \$S1
+# 
+#     # ignore exceptions
+#     push_eh done
+#     $op \$P2, \$P0, \$P1
+# 
+#     \$I0 = cmp \$P99, 115200
+#     
+#     is( \$I0, 0, \$S0 )
+#     goto end
+# 
+#   done:
+#     ok(1, 'ignoring exceptions')
+#   end:
+# .end
+# 
+# END
+# 
+# }
+
 # Local Variables:
-#   mode: cperl
+#   mode: pir
 #   cperl-indent-level: 4
 #   fill-column: 100
 # End:
-# vim: expandtab shiftwidth=4:
+# vim: expandtab shiftwidth=4 ft=pir :
Index: t/op/64bit.t
===================================================================
--- t/op/64bit.t	(revision 41853)
+++ t/op/64bit.t	(working copy)
@@ -1,14 +1,7 @@
-#!perl
-# Copyright (C) 2001-2005, Parrot Foundation.
+#! parrot
+# Copyright (C) 2001-2009, Parrot Foundation.
 # $Id$
 
-use strict;
-use warnings;
-use lib qw( . lib ../lib ../../lib );
-use Test::More;
-use Parrot::Test;
-use Parrot::Config;
-
 =head1 NAME
 
 t/op/64bit.t - Testing integer ops on 64-bit platforms
@@ -24,45 +17,54 @@
 
 =cut
 
-## remember to change the number of tests :-)
-if ( $PConfig{intvalsize} == 8 ) {
-    plan tests => 1;
-}
-else {
-    plan skip_all => "64bit INTVAL platforms only";
-}
+.sub main :main
+    .include "iglobals.pasm"
+    .include 'test_more.pir'
 
-pasm_output_is( <<'CODE', <<'OUTPUT', "bitops64" );
+    # Check to see if this is 64 bit
+    .local pmc interp     # a handle to our interpreter object.
+    interp = getinterp
+    .local pmc config
+    config = interp[.IGLOBALS_CONFIG_HASH]
+    .local int intvalsize 
+    intvalsize = config['intvalsize']
+
+    plan(5)
+
+    if intvalsize == 8 goto is_64_bit
+       skip(5, "this is not a 64 bit platform")
+    goto end
+
+  is_64_bit:
+    bitops64()
+
+  end:
+.end
+
+
+.sub bitops64
         # check bitops for 8-byte ints
-        set I0, 0xffffffffffffffff
-        print I0 # -1
-        print "\n"
-        set I1, 0x00000000ffffffff
-        print I1 # 4294967295
-        print "\n"
-        set I0, I1
-        shl I0, I0, 32
-        print I0 # -4294967296
-        print "\n"
-        band I2, I0, I1
-        print I2 # 0
-        print "\n"
-        bor I2, I0, I1
-        print I2 # -1
-        print "\n"
-        end
 
-CODE
--1
-4294967295
--4294967296
-0
--1
-OUTPUT
+        set $I0, 0xffffffffffffffff
+        is( $I0, -1 )
+    
+        set $I1, 0x00000000ffffffff
+        is( $I1, 4294967295 )
+    
+        set $I0, $I1
+        shl $I0, $I0, 32
+        is( $I0, -4294967296 )
+        
+        band $I2, $I0, $I1
+        is( $I2, 0 )
 
+        bor $I2, $I0, $I1
+        is( $I2, -1 )
+.end
+
 # Local Variables:
-#   mode: cperl
+#   mode: pir
 #   cperl-indent-level: 4
 #   fill-column: 100
 # End:
-# vim: expandtab shiftwidth=4:
+# vim: expandtab shiftwidth=4 ft=pir:
Index: t/op/arithmetics.t
===================================================================
--- t/op/arithmetics.t	(revision 41853)
+++ t/op/arithmetics.t	(working copy)
@@ -1,17 +1,7 @@
-#!perl
-# Copyright (C) 2001-2009, Parrot Foundation.
+#! parrot
+# Copyright (C) 2001-2008, Parrot Foundation.
 # $Id$
 
-use strict;
-use warnings;
-use lib qw( . lib ../lib ../../lib );
-
-use Test::More;
-use Parrot::Test tests => 21;
-
-# test for GMP
-use Parrot::Config;
-
 =head1 NAME
 
 t/op/arithmetics.t - Arithmetic Ops
@@ -27,577 +17,513 @@
 
 =cut
 
+.sub main :main
+    .include 'test_more.pir'
+
+    plan(125)
+
+    take_the_negative_of_a_native_integer()
+    take_the_absolute_of_a_native_integer()
+    add_native_integer_to_native_integer()
+    subtract_native_integer_from_native_integer()
+    multiply_native_integer_with_native_integer()
+    divide_native_integer_by_native_integer()
+    negate_minus_zero_point_zero()
+    negate_a_native_number()
+    take_the_absolute_of_a_native_number()
+    ceil_of_a_native_number()
+    floor_of_a_native_number()
+    add_native_integer_to_native_number()
+    subtract_native_integer_from_native_number()
+    multiply_native_number_with_native_integer()
+    divide_native_number_by_native_integer()
+    add_native_number_to_native_number()
+    subtract_native_number_from_native_number()
+    multiply_native_number_with_native_number()
+    divide_native_number_by_native_number()
+    lcm_test()
+    integer_overflow_with_pow()
+    # END_OF_TESTS
+
+.end
+
 #
 # Operations on a single INTVAL
 #
-pasm_output_is( <<'CODE', <<OUTPUT, "take the negative of a native integer" );
-        set I0, 0
-        neg I0
-        say I0
-        set I0, 1234567890
-        neg I0
-        say I0
-        set I0, -1234567890
-        neg I0
-        say I0
-        set I0, 0
-        set I1, 0
-        neg I1, I0
-        say I1
-        set I0, 1234567890
-        neg I1, I0
-        say I1
-        set I0, -1234567890
-        neg I1, I0
-        say I1
-        end
-CODE
-0
--1234567890
-1234567890
-0
--1234567890
-1234567890
-OUTPUT
+.sub take_the_negative_of_a_native_integer
+    set $I0, 0
+    neg $I0
+    is( $I0, "0", '' )
 
-pasm_output_is( <<'CODE', <<OUTPUT, "take the absolute of a native integer" );
-        set I0, 0
-        abs I0
-        say I0
-        set I0, 1234567890
-        abs I0
-        say I0
-        set I0, -1234567890
-        abs I0
-        say I0
-        set I0, 0
-        set I1, 0
-        abs I1, I0
-        say I1
-        set I0, 1234567890
-        abs I1, I0
-        say I1
-        set I0, -1234567890
-        abs I1, I0
-        say I1
-        end
-CODE
-0
-1234567890
-1234567890
-0
-1234567890
-1234567890
-OUTPUT
+    set $I0, 1234567890
+    neg $I0
+    is( $I0, "-1234567890", '' )
+   
+    set $I0, -1234567890
+    neg $I0
+    is( $I0, "1234567890", '' )
+    
+    set $I0, 0
+    set $I1, 0
+    neg $I1, $I0
+    is( $I1, "0", '' )
+   
+    set $I0, 1234567890
+    neg $I1, $I0
+    is( $I1, "-1234567890", '' )
+    
+    set $I0, -1234567890
+    neg $I1, $I0
+    is( $I1, "1234567890", '' )
+.end
 
+.sub take_the_absolute_of_a_native_integer
+    set $I0, 0
+    abs $I0
+    is( $I0, "0", '' )
+
+    set $I0, 1234567890
+    abs $I0
+    is( $I0, "1234567890", '' )
+
+    set $I0, -1234567890
+    abs $I0
+    is( $I0, "1234567890", '' )
+
+    set $I0, 0
+    set $I1, 0
+    abs $I1, $I0
+    is( $I1, "0", '' )
+
+    set $I0, 1234567890
+    abs $I1, $I0
+    is( $I1, "1234567890", '' )
+
+    set $I0, -1234567890
+    abs $I1, $I0
+    is( $I1, "1234567890", '' )
+.end
+ 
 #
 # first arg is INTVAL, second arg is INTVAL
 #
-pasm_output_is( <<'CODE', <<OUTPUT, "add native integer to native integer" );
-        set I0, 4000
-        set I1, -123
-        add I2, I0, I1
-        say I2
-        add I0, I0, I1
-        say I0
-        end
-CODE
-3877
-3877
-OUTPUT
+.sub add_native_integer_to_native_integer
+    set $I0, 4000
+    set $I1, -123
+    add $I2, $I0, $I1
+    is( $I2, "3877", '' )
 
-pasm_output_is( <<'CODE', <<OUTPUT, "subtract native integer from native integer" );
-        set I0, 4000
-        set I1, -123
-        sub I2, I0, I1
-        say I2
-        sub I0, I0, I1
-        say I0
-        end
-CODE
-4123
-4123
-OUTPUT
+    add $I0, $I0, $I1
+    is( $I0, "3877", '' )
+.end
+ 
+.sub subtract_native_integer_from_native_integer
+    set $I0, 4000
+    set $I1, -123
+    sub $I2, $I0, $I1
+    is( $I2, "4123", '' )
 
-pasm_output_is( <<'CODE', <<OUTPUT, "multiply native integer with native integer" );
-        set I0, 4000
-        set I1, -123
-        mul I2, I0, I1
-        say I2
-        mul I0, I0, I1
-        say I0
-        end
-CODE
--492000
--492000
-OUTPUT
+    sub $I0, $I0, $I1
+    is( $I0, "4123", '' )
+.end
+ 
+.sub multiply_native_integer_with_native_integer
+    set $I0, 4000
+    set $I1, -123
+    mul $I2, $I0, $I1
+    is( $I2, "-492000", '' )
 
-pasm_output_is( <<'CODE', <<OUTPUT, "divide native integer by native integer" );
-        set I0, 4000
-        set I1, -123
-        div I2, I0, I1
-        say I2
-        div I0, I0, I1
-        say I0
-        end
-CODE
--32
--32
-OUTPUT
+    mul $I0, $I0, $I1
+    is( $I0, "-492000", '' )
+.end
+ 
+.sub divide_native_integer_by_native_integer
+    set $I0, 4000
+    set $I1, -123
+    div $I2, $I0, $I1
+    is( $I2, "-32", '' )
 
+    div $I0, $I0, $I1
+    is( $I0, "-32", '' )
+.end
+ 
 #
 # print -0.0 as -0
 #
+.sub negate_minus_zero_point_zero
+    set $N0, 0
+    neg $N0
+    $S0 = $N0
+    is( $S0, "-0", '1' )
 
-pasm_output_is( <<'CODE', <<OUTPUT, 'negate -0.0' );
-        set N0, 0
-        neg N0
-        say N0
-        set N0, -0.0
-        neg N0
-        say N0
-        set N0, -0.0
-        neg N1, N0
-        say N1
-        set N0, 0
-        set N1, 1
-        neg N1, N0
-        say N1
-        end
-CODE
--0
-0
-0
--0
-OUTPUT
+    set $N0, -0.0
+    neg $N0
+    $S0 = $N0
+    is( $S0, "0", '2' )
 
+    set $N0, -0.0
+    neg $N1, $N0
+    $S0 = $N1
+    is( $S0, "0", '3' )
 
-
+    set $N0, 0
+    set $N1, 1
+    neg $N1, $N0
+    $S0 = $N1
+    is( $S0, "-0", '4' )
+.end
+ 
 #
 # Operations on a single NUMVAL
 #
+.sub negate_a_native_number
+    set $N0, 123.4567890
+    neg $N0
+    is( $N0, "-123.456789", '' )
 
-pasm_output_is( <<'CODE', <<OUTPUT, 'negate a native number' );
-        set N0, 123.4567890
-        neg N0
-        say N0
-        set N0, -123.4567890
-        neg N0
-        say N0
-        set N0, 123.4567890
-        neg N1, N0
-        say N1
-        set N0, -123.4567890
-        neg N1, N0
-        say N1
-        end
-CODE
--123.456789
-123.456789
--123.456789
-123.456789
-OUTPUT
+    set $N0, -123.4567890
+    neg $N0
+    is( $N0, "123.456789", '' )
 
-pasm_output_is( <<'CODE', <<OUTPUT, "take the absolute of a native number" );
-        set N0, 0
-        abs N0
-        say N0
-        set N0, -0.0
-        abs N0
-        say N0
-        set N0, 123.45678901
-        abs N0
-        say N0
-        set N0, -123.45678901
-        abs N0
-        say N0
-        set N0, 0
-        set N1, 1
-        abs N1, N0
-        say N1
-        set N0, 0.0
-        set N1, 1
-        abs N1, N0
-        say N1
-        set N0, 123.45678901
-        set N1, 1
-        abs N1, N0
-        say N1
-        set N0, -123.45678901
-        set N1, 1
-        abs N1, N0
-        say N1
-        end
-CODE
-0
-0
-123.45678901
-123.45678901
-0
-0
-123.45678901
-123.45678901
-OUTPUT
+    set $N0, 123.4567890
+    neg $N1, $N0
+    is( $N1, "-123.456789", '' )
 
-pasm_output_is( <<'CODE', <<OUTPUT, "ceil of a native number" );
-       set N0, 0
-       ceil N0
-       say N0
-       set N0, 123.45678901
-       ceil N0
-       say N0
-       set N0, -123.45678901
-       ceil N0
-       say N0
-       set N0, 0
-       set N1, 1
-       ceil N1, N0
-       say N1
-       set N0, 0.0
-       set N1, 1
-       ceil N1, N0
-       say N1
-       set N0, 123.45678901
-       set N1, 1
-       ceil N1, N0
-       say N1
-       set N0, -123.45678901
-       set N1, 1
-       ceil N1, N0
-       say N1
-       set N0, 0
-       set I1, 1
-       ceil I1, N0
-       say I1
-       set N0, 0.0
-       set I1, 1
-       ceil I1, N0
-       say I1
-       set N0, 123.45678901
-       set I1, 1
-       ceil I1, N0
-       say I1
-       set N0, -123.45678901
-       set I1, 1
-       ceil I1, N0
-       say I1
-       end
-CODE
-0
-124
--123
-0
-0
-124
--123
-0
-0
-124
--123
-OUTPUT
+    set $N0, -123.4567890
+    neg $N1, $N0
+    is( $N1, "123.456789", '' )
+.end
+ 
+.sub take_the_absolute_of_a_native_number
+    set $N0, 0
+    abs $N0
+    is( $N0, "0", '' )
 
-pasm_output_is( <<'CODE', <<OUTPUT, "floor of a native number" );
-       set N0, 0
-       floor N0
-       say N0
-       set N0, 123.45678901
-       floor N0
-       say N0
-       set N0, -123.45678901
-       floor N0
-       say N0
-       set N0, 0
-       set N1, 1
-       floor N1, N0
-       say N1
-       set N0, 0.0
-       set N1, 1
-       floor N1, N0
-       say N1
-       set N0, 123.45678901
-       set N1, 1
-       floor N1, N0
-       say N1
-       set N0, -123.45678901
-       set N1, 1
-       floor N1, N0
-       say N1
-       set N0, 0
-       set I1, 1
-       floor I1, N0
-       say I1
-       set N0, 0.0
-       set I1, 1
-       floor I1, N0
-       say I1
-       set N0, 123.45678901
-       set I1, 1
-       floor I1, N0
-       say I1
-       set N0, -123.45678901
-       set I1, 1
-       floor I1, N0
-       say I1
-       end
-CODE
-0
-123
--124
-0
-0
-123
--124
-0
-0
-123
--124
-OUTPUT
+    set $N0, -0.0
+    abs $N0
+    is( $N0, "0", '' )
 
+    set $N0, 123.45678901
+    abs $N0
+    is( $N0, "123.45678901", '' )
+
+    set $N0, -123.45678901
+    abs $N0
+    is( $N0, "123.45678901", '' )
+
+    set $N0, 0
+    set $N1, 1
+    abs $N1, $N0
+    is( $N1, "0", '' )
+
+    set $N0, 0.0
+    set $N1, 1
+    abs $N1, $N0
+    is( $N1, "0", '' )
+
+    set $N0, 123.45678901
+    set $N1, 1
+    abs $N1, $N0
+    is( $N1, "123.45678901", '' )
+
+    set $N0, -123.45678901
+    set $N1, 1
+    abs $N1, $N0
+    is( $N1, "123.45678901", '' )
+.end
+ 
+.sub ceil_of_a_native_number
+    set $N0, 0
+    ceil $N0
+    is( $N0, "0", '' )
+
+    set $N0, 123.45678901
+    ceil $N0
+    is( $N0, "124", '' )
+
+    set $N0, -123.45678901
+    ceil $N0
+    is( $N0, "-123", '' )
+
+    set $N0, 0
+    set $N1, 1
+    ceil $N1, $N0
+    is( $N1, "0", '' )
+
+    set $N0, 0.0
+    set $N1, 1
+    ceil $N1, $N0
+    is( $N1, "0", '' )
+
+    set $N0, 123.45678901
+    set $N1, 1
+    ceil $N1, $N0
+    is( $N1, "124", '' )
+
+    set $N0, -123.45678901
+    set $N1, 1
+    ceil $N1, $N0
+    is( $N1, "-123", '' )
+
+    set $N0, 0
+    set $I1, 1
+    ceil $I1, $N0
+    is( $I1, "0", '' )
+
+    set $N0, 0.0
+    set $I1, 1
+    ceil $I1, $N0
+    is( $I1, "0", '' )
+
+    set $N0, 123.45678901
+    set $I1, 1
+    ceil $I1, $N0
+    is( $I1, "124", '' )
+
+    set $N0, -123.45678901
+    set $I1, 1
+    ceil $I1, $N0
+    is( $I1, "-123", '' )
+.end
+
+.sub floor_of_a_native_number
+    set $N0, 0
+    floor $N0
+    is( $N0, "0", '' )
+
+    set $N0, 123.45678901
+    floor $N0
+    is( $N0, "123", '' )
+
+    set $N0, -123.45678901
+    floor $N0
+    is( $N0, "-124", '' )
+
+    set $N0, 0
+    set $N1, 1
+    floor $N1, $N0
+    is( $N1, "0", '' )
+
+    set $N0, 0.0
+    set $N1, 1
+    floor $N1, $N0
+    is( $N1, "0", '' )
+
+    set $N0, 123.45678901
+    set $N1, 1
+    floor $N1, $N0
+    is( $N1, "123", '' )
+
+    set $N0, -123.45678901
+    set $N1, 1
+    floor $N1, $N0
+    is( $N1, "-124", '' )
+
+    set $N0, 0
+    set $I1, 1
+    floor $I1, $N0
+    is( $I1, "0", '' )
+
+    set $N0, 0.0
+    set $I1, 1
+    floor $I1, $N0
+    is( $I1, "0", '' )
+
+    set $N0, 123.45678901
+    set $I1, 1
+    floor $I1, $N0
+    is( $I1, "123", '' )
+
+    set $N0, -123.45678901
+    set $I1, 1
+    floor $I1, $N0
+    is( $I1, "-124", '' )
+
+.end
+
 #
 # FLOATVAL and INTVAL tests
 #
-pasm_output_is( <<'CODE', <<OUTPUT, "add native integer to native number" );
-        set I0, 4000
-        set N0, -123.123
-        add N1, N0, I0
-        say N1
-        add N0, N0, I0
-        say N0
-        add N0, I0
-        say N0
-        end
-CODE
-3876.877
-3876.877
-7876.877
-OUTPUT
+.sub add_native_integer_to_native_number
+    set $I0, 4000
+    set $N0, -123.123
+    add $N1, $N0, $I0
+    is( $N1, "3876.877", '' )
 
-pasm_output_is( <<'CODE', <<OUTPUT, "subtract native integer from native number" );
-        set I0, 4000
-        set N0, -123.123
-        sub N1, N0, I0
-        say N1
-        sub N0, N0, I0
-        say N0
-        sub N0, I0
-        say N0
-        end
-CODE
--4123.123
--4123.123
--8123.123
-OUTPUT
+    add $N0, $N0, $I0
+    is( $N0, "3876.877", '' )
 
-pasm_output_is( <<'CODE', <<OUTPUT, "multiply native number with native integer" );
-        set I0, 4000
-        set N0, -123.123
-        mul N1, N0, I0
-        say N1
-        mul N0, N0, I0
-        say N0
-        mul N0, -2
-        say N0
-        end
-CODE
--492492
--492492
-984984
-OUTPUT
+    add $N0, $I0
+    is( $N0, "7876.877", '' )
 
-pasm_output_is( <<'CODE', <<OUTPUT, "divide native number by native integer" );
-        set I0, 4000
-        set N0, -123.123
-        div N1, N0, I0
-        say N1
-        div N0, N0, I0
-        say N0
-        div N0, 1
-        say N0
-        set N0, 100.000
-        div N0, 100
-        say N0
-        div N0, 0.01
-        say N0
-        end
-CODE
--0.03078075
--0.03078075
--0.03078075
-1
-100
-OUTPUT
+.end
+ 
+.sub subtract_native_integer_from_native_number
+    set $I0, 4000
+    set $N0, -123.123
+    sub $N1, $N0, $I0
+    is( $N1, "-4123.123", '' )
 
+    sub $N0, $N0, $I0
+    is( $N0, "-4123.123", '' )
+
+    sub $N0, $I0
+    is( $N0, "-8123.123", '' )
+
+.end
+ 
+.sub multiply_native_number_with_native_integer
+    set $I0, 4000
+    set $N0, -123.123
+    mul $N1, $N0, $I0
+    is( $N1, "-492492", '' )
+
+    mul $N0, $N0, $I0
+    is( $N0, "-492492", '' )
+
+    mul $N0, -2
+    is( $N0, "984984", '' )
+.end
+
+.sub divide_native_number_by_native_integer
+    set $I0, 4000
+    set $N0, -123.123
+    div $N1, $N0, $I0
+    is( $N1, "-0.03078075", '' )
+
+    div $N0, $N0, $I0
+    is( $N0, "-0.03078075", '' )
+
+    div $N0, 1
+    is( $N0, "-0.03078075", '' )
+
+    set $N0, 100.000
+    div $N0, 100
+    is( $N0, "1", '' )
+
+    div $N0, 0.01
+    is( $N0, "100", '' )
+.end
+ 
 #
 # FLOATVAL and FLOATVAL tests
 #
-pasm_output_is( <<'CODE', <<OUTPUT, "add native number to native number" );
-        set N2, 4000.246
-        set N0, -123.123
-        add N1, N0, N2
-        say N1
-        add N0, N0, N2
-        say N0
-        end
-CODE
-3877.123
-3877.123
-OUTPUT
+.sub add_native_number_to_native_number
+    set $N2, 4000.246
+    set $N0, -123.123
+    add $N1, $N0, $N2
+    is( $N1, "3877.123", '' )
 
-pasm_output_is( <<'CODE', <<OUTPUT, "subtract native number from native number" );
-        set N2, 4000.246
-        set N0, -123.123
-        sub N1, N0, N2
-        say N1
-        sub N0, N0, N2
-        say N0
-        end
-CODE
--4123.369
--4123.369
-OUTPUT
+    add $N0, $N0, $N2
+    is( $N0, "3877.123", '' )
+.end
+ 
+.sub subtract_native_number_from_native_number
+    set $N2, 4000.246
+    set $N0, -123.123
+    sub $N1, $N0, $N2
+    is( $N1, "-4123.369", '' )
 
-pasm_output_is( <<'CODE', <<OUTPUT, "multiply native number with native number" );
-        set N2, 4000.246
-        set N0, -123.123
-        mul N1, N0, N2
-        say N1
-        mul N0, N0, N2
-        say N0
-        end
-CODE
--492522.288258
--492522.288258
-OUTPUT
+    sub $N0, $N0, $N2
+    is( $N0, "-4123.369", '' )
 
-pasm_output_is( <<'CODE', <<OUTPUT, "divide native number by native number" );
-        set N2, 4000.246
-        set N0, -123.123
-        div N1, N0, N2
-        say N1
-        div N0, N0, N2
-        say N0
-        end
-CODE
--0.0307788571002883
--0.0307788571002883
-OUTPUT
+.end
+ 
+.sub multiply_native_number_with_native_number
+    set $N2, 4000.246
+    set $N0, -123.123
+    mul $N1, $N0, $N2
+    is( $N1, "-492522.288258", '' )
 
-pasm_output_is( <<'CODE', <<OUTPUT, "lcm_I_I_I" );
-        set I0, 10
-        set I1, 10
-        lcm I2, I1, I0
-        eq I2, 10, OK1
-        print "not "
-OK1:    say "ok 1"
+    mul $N0, $N0, $N2
+    is( $N0, "-492522.288258", '' )
 
-        set I1, 17
-        lcm I2, I1, I0
-        eq I2, 170, OK2
-        print I2
-        print "not "
-OK2:    print "ok 2\n"
+.end
+ 
+.sub divide_native_number_by_native_number
+    set $N2, 4000.246
+    set $N0, -123.123
+    div $N1, $N0, $N2
+    is( $N1, "-0.0307788571002883", '' )
 
-        set I0, 17
-        set I1, 10
-        lcm I2, I1, I0
-        eq I2, 170, OK3
-        print "not "
-OK3:    print "ok 3\n"
+    div $N0, $N0, $N2
+    is( $N0, "-0.0307788571002883", '' )
 
-        set I0, 10
-        set I1, 0
-        lcm I2, I1, I0
-        eq I2, 0, OK4
-        print "not "
-OK4:    print "ok 4\n"
+.end
+ 
+.sub lcm_test
+    set $I0, 10
+    set $I1, 10
+    lcm $I2, $I1, $I0
+    is( $I2, 10 )
 
-        set I0, 0
-        set I1, 10
-        lcm I2, I1, I0
-        eq I2, 0, OK5
-        print "not "
-OK5:    print "ok 5\n"
+    set $I1, 17
+    lcm $I2, $I1, $I0
+    is( $I2, 170 )
 
-        end
-CODE
-ok 1
-ok 2
-ok 3
-ok 4
-ok 5
-OUTPUT
+    set $I0, 17
+    set $I1, 10
+    lcm $I2, $I1, $I0
+    is( $I2, 170 )
 
-SKIP: {
-    skip( 'No integer overflow for 32-bit INTVALs without GMP installed', 1 )
-        if $PConfig{intvalsize} == 4 && !$PConfig{gmp};
+    set $I0, 10
+    set $I1, 0
+    lcm $I2, $I1, $I0
+    is( $I2, 0 )
 
-    pir_output_is( <<'CODE', <<OUTPUT, "integer overflow with 'pow'" );
-.sub main
+    set $I0, 0
+    set $I1, 10
+    lcm $I2, $I1, $I0
+    is( $I2, 0 )
+.end
+
+.sub integer_overflow_with_pow
+    .include "iglobals.pasm"
+
+    # Check that we aren't 32-bit INTVALs without GMP 
+    .local pmc interp     # a handle to our interpreter object.
+    interp = getinterp
+    .local pmc config
+    config = interp[.IGLOBALS_CONFIG_HASH]
+    .local int intvalsize 
+    intvalsize = config['intvalsize']
+    .local int gmp
+    gmp = config['gmp']
+
+    if intvalsize != 4 goto can_test
+    if gmp goto can_test
+        skip(40,'No integer overflow for 32-bit INTVALs without GMP installed')
+        goto end
+
+  can_test:
+
     .local pmc i1, i2, r
     i1 = new 'Integer'
     i2 = new 'Integer'
     i1 = 2
     i2 = 1
-next:
+    $I1 = 1
+  next:
     null r
     r = pow i1, i2
     $S0 = r
-    say $S0
+
+    $I1 = $I1 * 2
+    is( $S0, $I1 )
+
     inc i2
 # XXX: this must be extended to at least 64 bit range
 # when sure that the result is not floating point.
 # In the meantime, make sure it overflows nicely
 # on 32 bit.
     unless i2 > 40 goto next
+
+  end:
 .end
-CODE
-2
-4
-8
-16
-32
-64
-128
-256
-512
-1024
-2048
-4096
-8192
-16384
-32768
-65536
-131072
-262144
-524288
-1048576
-2097152
-4194304
-8388608
-16777216
-33554432
-67108864
-134217728
-268435456
-536870912
-1073741824
-2147483648
-4294967296
-8589934592
-17179869184
-34359738368
-68719476736
-137438953472
-274877906944
-549755813888
-1099511627776
-OUTPUT
-}
 
-
 # Local Variables:
-#   mode: cperl
+#   mode: pir
 #   cperl-indent-level: 4
 #   fill-column: 100
 # End:
-# vim: expandtab shiftwidth=4:
+# vim: expandtab shiftwidth=4 ft=pir :