# Copyright (c) 2007 The Hewlett-Packard Development Company
# All rights reserved.
#
# Redistribution and use of this software in source and binary forms,
# with or without modification, are permitted provided that the
# following conditions are met:
#
# The software must be used only for Non-Commercial Use which means any
# use which is NOT directed to receiving any direct monetary
# compensation for, or commercial advantage from such use.  Illustrative
# examples of non-commercial use are academic research, personal study,
# teaching, education and corporate research & development.
# Illustrative examples of commercial use are distributing products for
# commercial advantage and providing services using the software for
# commercial advantage.
#
# If you wish to use this software or functionality therein that may be
# covered by patents for commercial use, please contact:
#     Director of Intellectual Property Licensing
#     Office of Strategy and Technology
#     Hewlett-Packard Company
#     1501 Page Mill Road
#     Palo Alto, California  94304
#
# Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.  Redistributions
# in binary form must reproduce the above copyright notice, this list of
# conditions and the following disclaimer in the documentation and/or
# other materials provided with the distribution.  Neither the name of
# the COPYRIGHT HOLDER(s), HEWLETT-PACKARD COMPANY, nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.  No right of
# sublicense is granted herewith.  Derivatives of the software and
# output created using the software may be prepared, but only for
# Non-Commercial Uses.  Derivatives of the software may be shared with
# others provided: (i) the others agree to abide by the list of
# conditions herein which includes the Non-Commercial Use restrictions;
# and (ii) such Derivatives of the software include the above copyright
# notice to acknowledge the contribution from this software where
# applicable, this list of conditions and the disclaimer below.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
# Authors: Gabe Black

microcode = '''
def macroop BSWAP_D_R
{
    roli reg, reg, 8, dataSize=2
    roli reg, reg, 16, dataSize=4
    roli reg, reg, 8, dataSize=2
};

def macroop BSWAP_Q_R
{
    roli reg, reg, 8, dataSize=2
    roli reg, reg, 16, dataSize=4
    roli reg, reg, 8, dataSize=2
    roli reg, reg, 32, dataSize=8
    roli reg, reg, 8, dataSize=2
    roli reg, reg, 16, dataSize=4
    roli reg, reg, 8, dataSize=2
};
'''
#let {{
#    class BSWAP(Inst):
#       "GenFault ${new UnimpInstFault}"
#}};

@@ -3188,35 +3188,34 @@
 Size=2%0A    roli 
-reg
+t1
 , reg, 16, dataS
@@ -3220,37 +3220,72 @@
 aSize=4%0A    
-roli reg, reg
+# Top 4 bytes of t1 are now zero%0A    roli t1, t1
 , 8, dataSiz
@@ -3297,24 +3297,22 @@
    roli 
-reg, reg
+t1, t1
 , 32, da
@@ -3324,32 +3324,32 @@
 e=8%0A    
+s
 r
-o
 li 
-reg
+t2
 , reg, 
-8
+32
 , dataSi
@@ -3343,33 +3343,33 @@
 g, 32, dataSize=
-2
+8
 %0A    roli reg, r
@@ -3358,36 +3358,33 @@
 =8%0A    roli 
-reg, reg, 16
+t2, t2, 8
 , dataSize=4
@@ -3374,33 +3374,33 @@
 t2, 8, dataSize=
-4
+2
 %0A    roli reg, r
@@ -3397,113 +3397,133 @@
 oli 
-reg, reg, 8, dataSize=2%0A%7D;%0A'''%0A#let %7B%7B%0A#    class BSWAP(Inst):%0A#       %22GenFault $%7Bnew UnimpInstFault%7D%22%0A#%7D%7D;
+t2, t2, 16, dataSize=4%0A    # Top 4 bytes of t2 are now zero%0A    roli t2, t2, 8, dataSize=2%0A    or reg, t1, t2, dataSize=8%0A%7D;%0A'''
 %0A

Make the qaud width bswap instruction handle the fact that 32 bit operations zero extend.