[Vm-dev] [commit][2783] update BitBltArmSimdASm. hdr now that asasm condition-code bug is fixed

[commits at squeakvm.org]

Revision: 2783
Author:   rowledge
Date:     2013-09-10 16:39:47 -0700 (Tue, 10 Sep 2013)
Log Message:
-----------
update BitBltArmSimdASm.hdr now that asasm condition-code bug is fixed

Modified Paths:
--------------
    trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimdAsm.hdr
    trunk/platforms/Cross/plugins/BitBltPlugin/BitBltDispatch.c

Modified: trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimdAsm.hdr
===================================================================
--- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimdAsm.hdr	2013-09-09 20:31:49 UTC (rev 2782)
+++ trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimdAsm.hdr	2013-09-10 23:39:47 UTC (rev 2783)
@@ -22,6 +22,11 @@
 ; SOFTWARE.
 ;
 
+; NOTE- older versions of ASASM had a bug which required a workaround in 
+; the macros SEL, UADD8, USUB8 & USUB16. This work-around is NOT present
+; in this version. You must make sure to use an asasm dated post 2013-08-01
+; or version 6495
+
       [ :LNOT: :DEF: DebugData
         GBLL    DebugData
       ]
@@ -155,26 +160,25 @@
 
  [ :LNOT: :DEF: |objasm$version| :LAND: :LNOT: :DEF: |ads$version|
  ; Assume asasm, which is lacking a number of key opcodes
- ; Note there's a bug in asasm, the CC_ENCODING value shouldn't need shifting
 
         MACRO
 $label  SEL$cond $Rd, $Rn, $Rm
-$label  DCI     :CC_ENCODING:"$cond":SHL:28 :OR: &06800FB0 :OR: (:RCONST:$Rn :SHL: 16) :OR: (:RCONST:$Rd :SHL: 12) :OR: (:RCONST:$Rm :SHL: 0)
+$label  DCI     :CC_ENCODING:"$cond" :OR: &06800FB0 :OR: (:RCONST:$Rn :SHL: 16) :OR: (:RCONST:$Rd :SHL: 12) :OR: (:RCONST:$Rm :SHL: 0)
         MEND
 
         MACRO
 $label  UADD8$cond $Rd, $Rn, $Rm
-$label  DCI     :CC_ENCODING:"$cond":SHL:28 :OR: &06500F90 :OR: (:RCONST:$Rn :SHL: 16) :OR: (:RCONST:$Rd :SHL: 12) :OR: (:RCONST:$Rm :SHL: 0)
+$label  DCI     :CC_ENCODING:"$cond" :OR: &06500F90 :OR: (:RCONST:$Rn :SHL: 16) :OR: (:RCONST:$Rd :SHL: 12) :OR: (:RCONST:$Rm :SHL: 0)
         MEND
 
         MACRO
 $label  USUB8$cond $Rd, $Rn, $Rm
-$label  DCI     :CC_ENCODING:"$cond":SHL:28 :OR: &06500FF0 :OR: (:RCONST:$Rn :SHL: 16) :OR: (:RCONST:$Rd :SHL: 12) :OR: (:RCONST:$Rm :SHL: 0)
+$label  DCI     :CC_ENCODING:"$cond" :OR: &06500FF0 :OR: (:RCONST:$Rn :SHL: 16) :OR: (:RCONST:$Rd :SHL: 12) :OR: (:RCONST:$Rm :SHL: 0)
         MEND
 
         MACRO
 $label  USUB16$cond $Rd, $Rn, $Rm
-$label  DCI     :CC_ENCODING:"$cond":SHL:28 :OR: &06500F70 :OR: (:RCONST:$Rn :SHL: 16) :OR: (:RCONST:$Rd :SHL: 12) :OR: (:RCONST:$Rm :SHL: 0)
+$label  DCI     :CC_ENCODING:"$cond" :OR: &06500F70 :OR: (:RCONST:$Rn :SHL: 16) :OR: (:RCONST:$Rd :SHL: 12) :OR: (:RCONST:$Rm :SHL: 0)
         MEND
 
         MACRO

Modified: trunk/platforms/Cross/plugins/BitBltPlugin/BitBltDispatch.c
===================================================================
--- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltDispatch.c	2013-09-09 20:31:49 UTC (rev 2782)
+++ trunk/platforms/Cross/plugins/BitBltPlugin/BitBltDispatch.c	2013-09-10 23:39:47 UTC (rev 2783)
@@ -37,7 +37,7 @@
 #include "BitBltInternal.h"
 
 /** Define this to enable profiling */
-//#define PROFILING
+#define PROFILING
 
 #ifdef PROFILING
 #include <stdio.h>