From 8efd5064718de9c96993ae63dd7bac67094eeff7 Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Fri, 1 Apr 2022 17:11:57 -0400
Subject: [PATCH] Transcribe up to the end of 'e', use `extswx` and remove
 `extsw`.

---
 InstructionSets/PowerPC/Decoder.cpp     |  2 +-
 InstructionSets/PowerPC/Instruction.hpp | 84 ++++++++++++++++++++++---
 2 files changed, 76 insertions(+), 10 deletions(-)

diff --git a/InstructionSets/PowerPC/Decoder.cpp b/InstructionSets/PowerPC/Decoder.cpp
index 611947e3d..ea08b910c 100644
--- a/InstructionSets/PowerPC/Decoder.cpp
+++ b/InstructionSets/PowerPC/Decoder.cpp
@@ -120,7 +120,7 @@ Instruction Decoder::decode(uint32_t opcode) {
 		BindConditional(is64bit, SixTen(0b011111, 0b0111101001), divdx);	BindConditional(is64bit, SixTen(0b011111, 0b1111101001), divdx);
 		BindConditional(is64bit, SixTen(0b011111, 0b1000011011), srdx);
 		BindConditional(is64bit, SixTen(0b011111, 0b1100011010), sradx);
-		BindConditional(is64bit, SixTen(0b111111, 0b1111011010), extsw);
+		BindConditional(is64bit, SixTen(0b111111, 0b1111011010), extswx);
 
 		// Power instructions; these are all taken from the MPC601 manual rather than
 		// the PowerPC Programmer's Reference Guide, hence the decimal encoding of the
diff --git a/InstructionSets/PowerPC/Instruction.hpp b/InstructionSets/PowerPC/Instruction.hpp
index d878c679c..0532f8599 100644
--- a/InstructionSets/PowerPC/Instruction.hpp
+++ b/InstructionSets/PowerPC/Instruction.hpp
@@ -101,7 +101,7 @@ enum class Operation: uint8_t {
 
 	/// Divide short.
 	/// divs divs. divso divso.
-	/// rA(), rB(), rD(), rc(), eo()
+	/// rD(), rA(), rB()	[rc(), eo()]
 	///
 	/// Signed 32-bit divide. rD = rA/rB; remainder is
 	/// placed into MQ. The ermainder has the same sign as the dividend
@@ -112,15 +112,15 @@ enum class Operation: uint8_t {
 	divsx,
 
 	/// Difference or zero.
-	/// dozx
-	/// rA(), rB(), rD()
+	/// doz doz. dozo dozo.
+	/// rD(), rA(), rB()	[rc(), oe()]
 	///
 	/// if rA > rB then rD = 0; else rD = NOT(rA) + rB + 1.
 	dozx,
 
 	/// Difference or zero immediate.
 	/// dozi
-	/// rA(), rD(), simm()
+	/// rD(), rA(), simm()
 	///
 	/// if rA > simm() then rD = 0; else rD = NOT(rA) + simm() + 1.
 	dozi,
@@ -355,8 +355,46 @@ enum class Operation: uint8_t {
 	/// rA(), rB()
 	dcbz,
 
-	divwx, divwux, eciwx, ecowx, eieio, eqvx,
-	extsbx, extshx, fabsx, faddx, faddsx, fcmpo, fcmpu, fctiwx, fctiwzx,
+	/// Divide word.
+	/// divw divw. divwo divwo.
+	/// rD(), rA(), rB()	[rc(), oe()]
+	divwx,
+
+	/// Divide word unsigned.
+	/// divwu divwu. divwuo divwuo.
+	/// rD(), rA(), rB()	[rc(), oe()]
+	divwux,
+
+	/// External control in word indexed.
+	/// eciwx
+	/// rD(), rA(), rB()
+	eciwx,
+
+	/// External control out word indexed.
+	/// ecowx
+	/// rS(), rA(), rB()
+	ecowx,
+
+	/// Enforce in-order execition of I/O
+	/// eieio
+	eieio,
+
+	/// Equivalent.
+	/// eqv eqv.
+	/// rA(), rS(), rB()	[rc()]
+	eqvx,
+
+	/// Extend sign byte.
+	/// extsb extsb.
+	/// rA(), rS()	[rc()]
+	extsbx,
+
+	/// Extend sign half-word.
+	/// extsh extsh.
+	/// rA(), rS()	[rc()]
+	extshx,
+
+	fabsx, faddx, faddsx, fcmpo, fcmpu, fctiwx, fctiwzx,
 	fdivx, fdivsx, fmaddx, fmaddsx, fmrx, fmsubx, fmsubsx, fmulx, fmulsx,
 	fnabsx, fnegx, fnmaddx, fnmaddsx, fnmsubx, fnmsubsx, frspx, fsubx, fsubsx,
 	icbi, isync, lbz, lbzu,
@@ -483,12 +521,16 @@ enum class Operation: uint8_t {
 	/// rA(), rB(), rS(), mb(), me(), rc()
 	rlwnmx,
 
+	/// System call.
+	/// sc
 	sc,
 
 	/// Shift left word.
 	/// slw slw.
 	/// rA(), rS(), rB()	[rc()]
-	slwx, srawx, srawix, srwx, stb, stbu,
+	slwx,
+
+	srawx, srawix, srwx, stb, stbu,
 
 	/// Store byte with update indexed.
 	///
@@ -577,9 +619,33 @@ enum class Operation: uint8_t {
 	//
 	// MARK: - 64-bit only PowerPC instructions.
 	//
-	cntlzdx, divdx, divdux, extswx, fcfidx, fctidx, fctidzx, tdi, mulhdux,
+	cntlzdx,
+
+	/// Divide double word.
+	/// divd divd. divdo divdo.
+	/// rD(), rA(), rB()	[rc(), oe()]
+	divdx,
+
+	/// Divide double word unsigned.
+	/// divdu divdu. divduo divduo.
+	/// rD(), rA(), rB()	[rc(), oe()]
+	divdux,
+
+	/// Extend sign word.
+	/// extsw extsw.
+	/// rA(), rS()	[rc()]
+	extswx,
+
+	fcfidx, fctidx, fctidzx, tdi, mulhdux,
 	ldx, sldx, ldux, td, mulhdx, ldarx, stdx, stdux, mulld, lwax, lwaux,
-	sradix, srdx, sradx, extsw, fsqrtsx, std, stdu, stdcx_,
+	sradix, srdx,
+
+	/// Shift right algebraic double word.
+	/// srad srad,
+	/// rA(), rS(), rB()	[rc()]
+	sradx,
+
+	fsqrtsx, std, stdu, stdcx_,
 };
 
 /*!