[svn:parrot] r40224 - in branches/bsr_jsr_ret: docs/book/draft docs/pdds/draft t/pmc

[whiteknight at svn.parrot.org]

Author: whiteknight
Date: Wed Jul 22 23:57:41 2009
New Revision: 40224
URL: https://trac.parrot.org/parrot/changeset/40224

Log:
[bsr_jsr_ret] convert a few more files

Modified:
   branches/bsr_jsr_ret/docs/book/draft/ch10_opcode_reference.pod
   branches/bsr_jsr_ret/docs/pdds/draft/pdd06_pasm.pod
   branches/bsr_jsr_ret/t/pmc/object-meths.t
   branches/bsr_jsr_ret/t/pmc/resizablebooleanarray.t

Modified: branches/bsr_jsr_ret/docs/book/draft/ch10_opcode_reference.pod
==============================================================================
--- branches/bsr_jsr_ret/docs/book/draft/ch10_opcode_reference.pod	Wed Jul 22 23:47:47 2009	(r40223)
+++ branches/bsr_jsr_ret/docs/book/draft/ch10_opcode_reference.pod	Wed Jul 22 23:57:41 2009	(r40224)
@@ -225,17 +225,6 @@
 
 I<Arguments: S>
 
-=head3 bsr
-
-X<bsr opcode (PASM)>
-
-  bsr R<LABEL>
-
-Branch to a label, like C<branch>, but also push the current location
-onto the call stack so C<ret> can return to it.
-
-I<Arguments: I>
-
 =head3 bxor
 
 X<bxor opcode (PASM)>
@@ -2046,15 +2035,6 @@
 
 See also: C<savetop>.
 
-=head3 ret
-
-X<ret opcode (PASM)>
-
-  ret
-
-Pop a location off the top of the call stack, and go there.
-Often used with C<bsr> and C<jsr>.
-
 =head3 rethrow
 
 X<rethrow opcode (PASM)>

Modified: branches/bsr_jsr_ret/docs/pdds/draft/pdd06_pasm.pod
==============================================================================
--- branches/bsr_jsr_ret/docs/pdds/draft/pdd06_pasm.pod	Wed Jul 22 23:47:47 2009	(r40223)
+++ branches/bsr_jsr_ret/docs/pdds/draft/pdd06_pasm.pod	Wed Jul 22 23:57:41 2009	(r40224)
@@ -203,20 +203,6 @@
 Branch forward or backward by the amount in register x. (X may be either Ix,
 Nx, or Px) Branch offset may also be an integer constant.
 
-=item jsr tx
-
-Jump to the location specified by register X. Push the current location onto
-the call stack for later returning.
-
-=item bsr ix
-
-Branch to the location specified by X (either register or label). Push the
-current location onto the call stack for later returning.
-
-=item ret
-
-Pop the location off the top of the stack and go there.
-
 =back
 
 =head3 Data manipulation

Modified: branches/bsr_jsr_ret/t/pmc/object-meths.t
==============================================================================
--- branches/bsr_jsr_ret/t/pmc/object-meths.t	Wed Jul 22 23:47:47 2009	(r40223)
+++ branches/bsr_jsr_ret/t/pmc/object-meths.t	Wed Jul 22 23:57:41 2009	(r40224)
@@ -462,7 +462,8 @@
 
     subclass P6, P3, "F"
     addparent P6, P4
-    bsr _check_isa
+    new P10, 'ResizableIntegerArray'
+    local_branch P10, _check_isa
 
     print "new F\n"
     new P16, ['F']
@@ -527,7 +528,7 @@
     isa I0, P1, "D"
     print I0
     print "\n"
-    ret
+    local_return P10
 
 
 .namespace ["A"]

Modified: branches/bsr_jsr_ret/t/pmc/resizablebooleanarray.t
==============================================================================
--- branches/bsr_jsr_ret/t/pmc/resizablebooleanarray.t	Wed Jul 22 23:47:47 2009	(r40223)
+++ branches/bsr_jsr_ret/t/pmc/resizablebooleanarray.t	Wed Jul 22 23:57:41 2009	(r40224)
@@ -393,6 +393,8 @@
 .end
 
 .sub aerobics
+    .local pmc jmpstack
+    jmpstack = new 'ResizableIntegerArray'
     new $P0, ['ResizableBooleanArray']
     set $I10, 10000
 
@@ -470,27 +472,27 @@
     .return()
   errFirstPop:
     print "FAILED: first pop\n"
-    bsr info
+    local_branch jmpstack, info
     .return()
   errSecondPop:
     print "FAILED: second pop\n"
-    bsr info
+    local_branch jmpstack, info
     .return()
   errBuildLen:
     print "FAILED: buildup length\n"
-    bsr info
+    local_branch jmpstack, info
     .return()
   errLeftGet:
     print "FAILED: left get\n"
-    bsr info
+    local_branch jmpstack, info
     .return()
   errRightGet:
     print "FAILED: right get\n"
-    bsr info
+    local_branch jmpstack, info
     .return()
   errTearDown:
     print "FAILED: tear down cap\n"
-    bsr info
+    local_branch jmpstack, info
     .return()
   info:
     ok(0, "aerobics goof:")
@@ -499,7 +501,7 @@
     print "\n#Wanted: "
     print $I3
     print "\n"
-    ret
+    local_return jmpstack
 .end