Added prefixes

Author: raphaelcohn

workspace/assembler/src/mk2/InstructionStream.rs

@@ -9,6 +9,37 @@ pub struct OrdinaryInstructionStream
 
 impl OrdinaryInstructionStream
 {
+	#[inline(always)]
+	fn prefix_fwait(&mut self, byte: u8)
+	{
+		self.byte_emitter.emit_u8(byte)
+	}
+	
+	#[inline(always)]
+	fn prefix_group1(&mut self, byte: u8)
+	{
+		self.byte_emitter.emit_u8(byte)
+	}
+	
+	#[inline(always)]
+	fn prefix_group2(&mut self, memory_operand_or_branch_hint: MemoryOperandOrBranchHint)
+	{
+		memory_operand_or_branch_hint.emit_prefix_group2(&mut self.byte_emitter)
+	}
+	
+	#[inline(always)]
+	fn prefix_group3(&mut self)
+	{
+		self.byte_emitter.emit_u8(0x66)
+	}
+	
+	#[inline(always)]
+	fn prefix_group4(&mut self, memory_operand: MemoryOperand)
+	{
+		memory_operand.emit_prefix_group4()
+	}
+	
+	
 	#[inline(always)]
 	fn opcode_1(&mut self, opcode: u8)
 	{
@@ -50,6 +81,9 @@ impl OrdinaryInstructionStream
 		self.displacement_immediate_1(displacement1);
 	}
 
+	/** A symbolic representation of a Rel32. No Rel8 equivalent is provided. */
+	//Label
+	
 	/// Records internal state for a label reference.
 	/// Saves the current code position and reserves space for the resolved address by emitting zero bytes.
 	#[inline(always)]
@@ -74,15 +108,11 @@ impl OrdinaryInstructionStream
 /*
 impl OrdinaryInstructionStream
 {
-	self.pref_fwait(0x9B);
-	
 	self.pref_group2(&mut self, arg0);
 
 	self.pref_group4(&mut self, arg0);
 	
 	self.pref_group3();
-
-	self.pref_group1(0xF2);
 	
 	rex!(self, arg1, arg0, 0x00);
 	/*

workspace/assembler/src/mk2/OrdinaryInstructionStream.rs

@@ -5,6 +5,4 @@
 
 
 
-/** A symbolic representation of a Rel32. No Rel8 equivalent is provided. */
-Label
 

workspace/assembler/src/mk2/Types.txt

@@ -5,20 +5,20 @@
 /// Represents a hint.
 #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 #[repr(u8)]
-pub enum Hint
+pub enum BranchHint
 {
 	/// Hint taken.
-	Taken = 0,
+	Taken = 0x3E,
 
 	/// Hint not taken.
-	NotTaken = 1,
+	NotTaken = 0x2E,
 }
 
-impl Default for Hint
+impl MemoryOperandOrBranchHint for BranchHint
 {
 	#[inline(always)]
-	fn default() -> Self
+	fn emit_prefix_group2(self, byte_emitter: &mut ByteEmitter)
 	{
-		X87Register::ST1
+		byte_emitter.emit_u8(self as u8)
 	}
 }

workspace/assembler/src/mk2/mnemonic_parameter_types/Hint.rs renamed to workspace/assembler/src/mk2/mnemonic_parameter_types/BranchHint.rs

@@ -0,0 +1,10 @@
+// This file is part of assembler. It is subject to the license terms in the COPYRIGHT file found in the top-level directory of this distribution and at https://raw.githubusercontent.com/lemonrock/assembler/master/COPYRIGHT. No part of predicator, including this file, may be copied, modified, propagated, or distributed except according to the terms contained in the COPYRIGHT file.
+// Copyright © 2017 The developers of assembler. See the COPYRIGHT file in the top-level directory of this distribution and at https://raw.githubusercontent.com/lemonrock/assembler/master/COPYRIGHT.
+
+
+/// Memory operand or branch hint.
+pub trait MemoryOperandOrBranchHint
+{
+	#[inline(always)]
+	fn emit_prefix_group2(self, byte_emitter: &mut ByteEmitter);
+}

workspace/assembler/src/mk2/mnemonic_parameter_types/MemoryOperandOrBranchHint.rs

@@ -69,6 +69,28 @@ impl MemoryOperand
 	}
 }
 
+impl MemoryOperandOrBranchHint for BranchHint
+{
+	#[inline(always)]
+	fn emit_prefix_group2(self, byte_emitter: &mut ByteEmitter)
+	{
+		if self.has_segment_register()
+		{
+			let segment_register_byte = match self.segment_register_index()
+			{
+				0 => 0x26,
+				1 => 0x2E,
+				2 => 0x36,
+				3 => 0x3E,
+				4 => 0x64,
+				5 => 0x65,
+				_ => unreachable!(),
+			};
+			byte_emitter.emit_u8(segment_register_byte)
+		}
+	}
+}
+
 impl MemoryOrRegister for MemoryOperand
 {
 	#[inline(always)]
@@ -203,6 +225,15 @@ impl MemoryOperand
 
 	const NullSegmentRegister: u64 = 0x07;
 
+	#[inline(always)]
+	pub(crate) fn emit_prefix_group4(self, byte_emitter: &mut ByteEmitter)
+	{
+		if self.has_address_override_for_32_bit()
+		{
+			byte_emitter.emit_u8(0x67)
+		}
+	}
+	
 	#[inline(always)]
 	pub fn new(displacement: Immediate32Bit, base: Option<impl GeneralPurposeRegister>, index: Option<impl GeneralPurposeRegister>, scale: IndexScale, segment_register: Option<impl AnySegmentRegister>, address_override_for_32_bit: bool, relative_instruction_pointer_offset: bool) -> Self
 	{

workspace/assembler/src/mk2/mnemonic_parameter_types/memory_operands/MemoryOperand.rs

@@ -34,6 +34,7 @@ pub mod singletons;
 
 
 include!("AsDisplacement.rs");
-include!("Hint.rs");
+include!("BranchHint.rs");
+include!("MemoryOperandOrBranchHint.rs");
 include!("MemoryOrRegister.rs");
 include!("ToOpcode.rs");