diff --git a/InstructionSets/PowerPC/Instruction.hpp b/InstructionSets/PowerPC/Instruction.hpp
index f88aa3ee1..a0694d74c 100644
--- a/InstructionSets/PowerPC/Instruction.hpp
+++ b/InstructionSets/PowerPC/Instruction.hpp
@@ -99,7 +99,7 @@ enum class Operation: uint8_t {
 
 	/// Load string and compare byte indexed.
 	/// lscbx lsxbx.
-	/// rD(), rA(), rB()
+	/// rD(), rA(), rB()	[rc()]
 	lscbxx,
 
 	/// Mask generate.
@@ -454,7 +454,15 @@ enum class Operation: uint8_t {
 	frspx,
 
 	fsubx, fsubsx,
-	icbi, isync,
+
+	/// Instruction cache block invalidate.
+	/// icbi
+	/// rA(), rB()
+	icbi,
+
+	/// Instruction synchronise.
+	/// isync
+	isync,
 
 	/// Load byte and zero.
 	/// lbz
@@ -1114,7 +1122,12 @@ struct Instruction {
 	uint32_t fm() const		{	return (opcode >> 17) & 0xff;		}
 
 	/// Specifies the number of bytes to move in an immediate string load or store.
-	uint32_t nb() const		{	return (opcode >> 11) & 0x1f;		}
+	uint32_t nb() const		{
+		// Map nb == 0 to 32, branchlessly, given that this is
+		// a five-bit field.
+		const uint32_t nb = (opcode >> 11) & 0x1f;
+		return ((nb - 1) & 31) + 1;
+	}
 
 	/// Specifies a shift amount.
 	uint32_t sh() const		{	return (opcode >> 11) & 0x1f;		}
diff --git a/OSBindings/Mac/Clock SignalTests/DingusdevPowerPCTests.mm b/OSBindings/Mac/Clock SignalTests/DingusdevPowerPCTests.mm
index d6ba709a8..f1450ad0c 100644
--- a/OSBindings/Mac/Clock SignalTests/DingusdevPowerPCTests.mm	
+++ b/OSBindings/Mac/Clock SignalTests/DingusdevPowerPCTests.mm	
@@ -310,6 +310,31 @@ NSString *offset(Instruction instruction) {
 				XCTAssertEqual([columns[4] intValue], instruction.imm());
 			break;
 
+			case Operation::mcrxr:
+				AssertEqualOperationName(operation, @"mcrxr");
+				XCTAssertEqualObjects(columns[3], conditionreg(instruction.crfD()));
+			break;
+
+			case Operation::icbi:
+				AssertEqualOperationName(operation, @"icbi");
+				AssertEqualR(columns[3], instruction.rA(), false);
+				AssertEqualR(columns[4], instruction.rB());
+			break;
+
+			case Operation::lswi:
+				AssertEqualOperationName(operation, @"lswi");
+				AssertEqualR(columns[3], instruction.rD());
+				AssertEqualR(columns[4], instruction.rA());
+				XCTAssertEqual([columns[5] hexInt], instruction.nb());
+			break;
+
+			case Operation::stswi:
+				AssertEqualOperationName(operation, @"stswi");
+				AssertEqualR(columns[3], instruction.rS());
+				AssertEqualR(columns[4], instruction.rA());
+				XCTAssertEqual([columns[5] hexInt], instruction.nb());
+			break;
+
 			case Operation::cmp:
 				if([operation isEqualToString:@"cmpw"]) {
 					XCTAssertFalse(instruction.l());
@@ -359,6 +384,15 @@ NSString *offset(Instruction instruction) {
 				XCTAssertEqual([columns[5] hexInt], instruction.simm());
 			break;
 
+			case Operation::mtfsb0x:
+			case Operation::mtfsb1x:
+				AssertEqualOperationNameE(
+					operation,
+					instruction.operation == Operation::mtfsb0x ? @"mtfsb0x" : @"mtfsb1x",
+					instruction);
+				XCTAssertEqual([columns[3] intValue], instruction.crbD());
+			break;
+
 #define NoArg(x)	\
 			case Operation::x:	\
 				AssertEqualOperationName(operation, @#x);	\
@@ -481,39 +515,45 @@ NSString *offset(Instruction instruction) {
 			ABCz(lwarx);
 			ABCz(stwbrx);
 			ABCz(sthbrx);
+			ABCz(eciwx);
+			ABCz(lswx);
+			ABCz(lwa);
+			ABCz(lwaux);
+			ABCz(lwax);
 
 #undef ABCz
 
-#define ABD(x)	\
+#define DABe(x)	\
 			case Operation::x:	\
 				AssertEqualOperationNameOE(operation, @#x, instruction);	\
 				[self testABDInstruction:instruction columns:columns testZero:NO];	\
 			break;
 
-			ABD(subfcx);
-			ABD(subfx);
-			ABD(negx);
-			ABD(subfex);
-			ABD(subfzex);
-			ABD(subfmex);
-			ABD(dozx);
-			ABD(absx);
-			ABD(nabsx);
-			ABD(addx);
-			ABD(addcx);
-			ABD(addex);
-			ABD(addmex);
-			ABD(addzex);
-			ABD(mulhwx);
-			ABD(mulhwux);
-			ABD(mulx);
-			ABD(mullwx);
-			ABD(divx);
-			ABD(divsx);
-			ABD(divwux);
-			ABD(divwx);
+			DABe(subfcx);
+			DABe(subfx);
+			DABe(negx);
+			DABe(subfex);
+			DABe(subfzex);
+			DABe(subfmex);
+			DABe(dozx);
+			DABe(absx);
+			DABe(nabsx);
+			DABe(addx);
+			DABe(addcx);
+			DABe(addex);
+			DABe(addmex);
+			DABe(addzex);
+			DABe(mulhwx);
+			DABe(mulhwux);
+			DABe(mulx);
+			DABe(mullwx);
+			DABe(divx);
+			DABe(divsx);
+			DABe(divwux);
+			DABe(divwx);
+			DABe(lscbxx);
 
-#undef ABD
+#undef DABe
 
 #define ASB(x)	\
 			case Operation::x:	\
@@ -536,7 +576,7 @@ NSString *offset(Instruction instruction) {
 
 #define SAB(x)	\
 			case Operation::x:	\
-				AssertEqualOperationName(operation, @#x, instruction);	\
+				AssertEqualOperationName(operation, @#x);	\
 				AssertEqualR(columns[3], instruction.rS());	\
 				AssertEqualR(columns[4], instruction.rA(), false);	\
 				AssertEqualR(columns[5], instruction.rB());	\
@@ -546,6 +586,20 @@ NSString *offset(Instruction instruction) {
 
 #undef SAB
 
+#define AS(x)	\
+			case Operation::x:	\
+				AssertEqualOperationNameE(operation, @#x, instruction);	\
+				AssertEqualR(columns[3], instruction.rA());	\
+				AssertEqualR(columns[4], instruction.rS());	\
+			break;
+
+			AS(cntlzwx);
+			AS(extsbx);
+			AS(extshx);
+			AS(extswx);
+
+#undef AS
+
 #define fSAB(x)	\
 			case Operation::x:	\
 				AssertEqualOperationName(operation, @#x, instruction);	\