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

Commit e4706772 authored by Harvey Harrison's avatar Harvey Harrison Committed by Avi Kivity
Browse files

KVM: x86 emulator: make register_address, address_mask static inlines 



Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent ddcb2885

arch/x86/kvm/x86_emulate.c

+29 −19
Original line number Diff line number Diff line
@@ -486,11 +486,21 @@ static inline unsigned long ad_mask(struct decode_cache *c) 
}



/* Access/update address held in a register, based on addressing mode. */

#define address_mask(reg)						\

	((c->ad_bytes == sizeof(unsigned long)) ? 			\

		(reg) :	((reg) & ad_mask(c)))

#define register_address(base, reg)                                     \

	((base) + address_mask(reg))

static inline unsigned long

address_mask(struct decode_cache *c, unsigned long reg)

{

	if (c->ad_bytes == sizeof(unsigned long))

		return reg;

	else

		return reg & ad_mask(c);

}



static inline unsigned long

register_address(struct decode_cache *c, unsigned long base, unsigned long reg)

{

	return base + address_mask(c, reg);

}



#define register_address_increment(reg, inc)                            \

	do {								\

		/* signed type ensures sign extension to long */        \
@@ -1056,7 +1066,7 @@ static inline void emulate_push(struct x86_emulate_ctxt *ctxt) 
	c->dst.bytes = c->op_bytes;

	c->dst.val = c->src.val;

	register_address_increment(c->regs[VCPU_REGS_RSP], -c->op_bytes);

	c->dst.ptr = (void *) register_address(ctxt->ss_base,

	c->dst.ptr = (void *) register_address(c, ctxt->ss_base,

					       c->regs[VCPU_REGS_RSP]);

}
@@ -1066,7 +1076,7 @@ static inline int emulate_grp1a(struct x86_emulate_ctxt *ctxt, 
	struct decode_cache *c = &ctxt->decode;

	int rc;



	rc = ops->read_std(register_address(ctxt->ss_base,

	rc = ops->read_std(register_address(c, ctxt->ss_base,

					    c->regs[VCPU_REGS_RSP]),

			   &c->dst.val, c->dst.bytes, ctxt->vcpu);

	if (rc != 0)
@@ -1388,11 +1398,11 @@ special_insn: 
		register_address_increment(c->regs[VCPU_REGS_RSP],

					   -c->op_bytes);

		c->dst.ptr = (void *) register_address(

			ctxt->ss_base, c->regs[VCPU_REGS_RSP]);

			c, ctxt->ss_base, c->regs[VCPU_REGS_RSP]);

		break;

	case 0x58 ... 0x5f: /* pop reg */

	pop_instruction:

		if ((rc = ops->read_std(register_address(ctxt->ss_base,

		if ((rc = ops->read_std(register_address(c, ctxt->ss_base,

			c->regs[VCPU_REGS_RSP]), c->dst.ptr,

			c->op_bytes, ctxt->vcpu)) != 0)

			goto done;
@@ -1417,9 +1427,9 @@ special_insn: 
				1,

				(c->d & ByteOp) ? 1 : c->op_bytes,

				c->rep_prefix ?

				address_mask(c->regs[VCPU_REGS_RCX]) : 1,

				address_mask(c, c->regs[VCPU_REGS_RCX]) : 1,

				(ctxt->eflags & EFLG_DF),

				register_address(ctxt->es_base,

				register_address(c, ctxt->es_base,

						 c->regs[VCPU_REGS_RDI]),

				c->rep_prefix,

				c->regs[VCPU_REGS_RDX]) == 0) {
@@ -1433,9 +1443,9 @@ special_insn: 
				0,

				(c->d & ByteOp) ? 1 : c->op_bytes,

				c->rep_prefix ?

				address_mask(c->regs[VCPU_REGS_RCX]) : 1,

				address_mask(c, c->regs[VCPU_REGS_RCX]) : 1,

				(ctxt->eflags & EFLG_DF),

				register_address(c->override_base ?

				register_address(c, c->override_base ?

							*c->override_base :

							ctxt->ds_base,

						 c->regs[VCPU_REGS_RSI]),
@@ -1525,10 +1535,10 @@ special_insn: 
	case 0xa4 ... 0xa5:	/* movs */

		c->dst.type = OP_MEM;

		c->dst.bytes = (c->d & ByteOp) ? 1 : c->op_bytes;

		c->dst.ptr = (unsigned long *)register_address(

		c->dst.ptr = (unsigned long *)register_address(c,

						   ctxt->es_base,

						   c->regs[VCPU_REGS_RDI]);

		if ((rc = ops->read_emulated(register_address(

		if ((rc = ops->read_emulated(register_address(c,

		      c->override_base ? *c->override_base :

					ctxt->ds_base,

					c->regs[VCPU_REGS_RSI]),
@@ -1545,7 +1555,7 @@ special_insn: 
	case 0xa6 ... 0xa7:	/* cmps */

		c->src.type = OP_NONE; /* Disable writeback. */

		c->src.bytes = (c->d & ByteOp) ? 1 : c->op_bytes;

		c->src.ptr = (unsigned long *)register_address(

		c->src.ptr = (unsigned long *)register_address(c,

				c->override_base ? *c->override_base :

						   ctxt->ds_base,

						   c->regs[VCPU_REGS_RSI]);
@@ -1557,7 +1567,7 @@ special_insn: 


		c->dst.type = OP_NONE; /* Disable writeback. */

		c->dst.bytes = (c->d & ByteOp) ? 1 : c->op_bytes;

		c->dst.ptr = (unsigned long *)register_address(

		c->dst.ptr = (unsigned long *)register_address(c,

						   ctxt->es_base,

						   c->regs[VCPU_REGS_RDI]);

		if ((rc = ops->read_emulated((unsigned long)c->dst.ptr,
@@ -1581,7 +1591,7 @@ special_insn: 
	case 0xaa ... 0xab:	/* stos */

		c->dst.type = OP_MEM;

		c->dst.bytes = (c->d & ByteOp) ? 1 : c->op_bytes;

		c->dst.ptr = (unsigned long *)register_address(

		c->dst.ptr = (unsigned long *)register_address(c,

						   ctxt->es_base,

						   c->regs[VCPU_REGS_RDI]);

		c->dst.val = c->regs[VCPU_REGS_RAX];
@@ -1593,7 +1603,7 @@ special_insn: 
		c->dst.type = OP_REG;

		c->dst.bytes = (c->d & ByteOp) ? 1 : c->op_bytes;

		c->dst.ptr = (unsigned long *)&c->regs[VCPU_REGS_RAX];

		if ((rc = ops->read_emulated(register_address(

		if ((rc = ops->read_emulated(register_address(c,

				c->override_base ? *c->override_base :

						   ctxt->ds_base,

						 c->regs[VCPU_REGS_RSI]),