Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c381a043 authored by Hollis Blanchard's avatar Hollis Blanchard Committed by Avi Kivity
Browse files

ppc: Create disassemble.h to extract instruction fields 



This is used in a couple places in KVM, but isn't KVM-specific.

However, this patch doesn't modify other in-kernel emulation code:
- xmon uses a direct copy of ppc_opc.c from binutils
- emulate_instruction() doesn't need it because it can use a series
  of mask tests.

Signed-off-by: default avatarHollis Blanchard <hollisb@us.ibm.com>
Acked-by: default avatarPaul Mackerras <paulus@samba.org>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 9dd921cf

arch/powerpc/include/asm/disassemble.h

0 → 100644
+80 −0
Original line number Diff line number Diff line 
/*

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License, version 2, as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.

 *

 * Copyright IBM Corp. 2008

 *

 * Authors: Hollis Blanchard <hollisb@us.ibm.com>

 */



#ifndef __ASM_PPC_DISASSEMBLE_H__

#define __ASM_PPC_DISASSEMBLE_H__



#include <linux/types.h>



static inline unsigned int get_op(u32 inst)

{

	return inst >> 26;

}



static inline unsigned int get_xop(u32 inst)

{

	return (inst >> 1) & 0x3ff;

}



static inline unsigned int get_sprn(u32 inst)

{

	return ((inst >> 16) & 0x1f) | ((inst >> 6) & 0x3e0);

}



static inline unsigned int get_dcrn(u32 inst)

{

	return ((inst >> 16) & 0x1f) | ((inst >> 6) & 0x3e0);

}



static inline unsigned int get_rt(u32 inst)

{

	return (inst >> 21) & 0x1f;

}



static inline unsigned int get_rs(u32 inst)

{

	return (inst >> 21) & 0x1f;

}



static inline unsigned int get_ra(u32 inst)

{

	return (inst >> 16) & 0x1f;

}



static inline unsigned int get_rb(u32 inst)

{

	return (inst >> 11) & 0x1f;

}



static inline unsigned int get_rc(u32 inst)

{

	return inst & 0x1;

}



static inline unsigned int get_ws(u32 inst)

{

	return (inst >> 11) & 0x1f;

}



static inline unsigned int get_d(u32 inst)

{

	return inst & 0xffff;

}



#endif /* __ASM_PPC_DISASSEMBLE_H__ */

arch/powerpc/kvm/emulate.c

+1 −56
Original line number Diff line number Diff line
@@ -28,62 +28,7 @@ 
#include <asm/time.h>

#include <asm/byteorder.h>

#include <asm/kvm_ppc.h>



/* Instruction decoding */

static inline unsigned int get_op(u32 inst)

{

	return inst >> 26;

}



static inline unsigned int get_xop(u32 inst)

{

	return (inst >> 1) & 0x3ff;

}



static inline unsigned int get_sprn(u32 inst)

{

	return ((inst >> 16) & 0x1f) | ((inst >> 6) & 0x3e0);

}



static inline unsigned int get_dcrn(u32 inst)

{

	return ((inst >> 16) & 0x1f) | ((inst >> 6) & 0x3e0);

}



static inline unsigned int get_rt(u32 inst)

{

	return (inst >> 21) & 0x1f;

}



static inline unsigned int get_rs(u32 inst)

{

	return (inst >> 21) & 0x1f;

}



static inline unsigned int get_ra(u32 inst)

{

	return (inst >> 16) & 0x1f;

}



static inline unsigned int get_rb(u32 inst)

{

	return (inst >> 11) & 0x1f;

}



static inline unsigned int get_rc(u32 inst)

{

	return inst & 0x1;

}



static inline unsigned int get_ws(u32 inst)

{

	return (inst >> 11) & 0x1f;

}



static inline unsigned int get_d(u32 inst)

{

	return inst & 0xffff;

}

#include <asm/disassemble.h>



static void kvmppc_emulate_dec(struct kvm_vcpu *vcpu)

{