rename MemOperand as RegExp

readme.md

@@ -49,6 +49,13 @@ Linux:
 
 These files are copied into /usr/local/include/xbyak
 
+Break backward compatibility
+-------------
+At the next version, (old) Reg32e class will split (new) Reg32e class and (new) RegExp.
+(new) Reg32e class is Reg32 or Reg64.
+(new) RegExp class is to deal with 'Reg32e + Reg32e * scale + disp'.
+Please rename Reg32e as RegExp if you use (old) Reg32e as RegExp.
+
 New Feature
 -------------
 

sample/calc.cpp

@@ -37,7 +37,7 @@ private:
 	size_t constTblPos_;
 	int regIdx_;
 	Map varMap_; // map var name to index
-	const Xbyak::MemOperand& valTbl_;
+	const Xbyak::RegExp& valTbl_;
 #ifdef XBYAK32
 	const Xbyak::Reg32& tbl_;
 #else

sample/calc2.cpp

@@ -105,7 +105,7 @@ private:
 	size_t constTblPos_;
 	int regIdx_;
 #ifdef XBYAK32
-	const Xbyak::MemOperand& varTbl_;
+	const Xbyak::RegExp& varTbl_;
 #endif
 #ifdef XBYAK32
 	const Xbyak::Reg32& tbl_;

xbyak/xbyak.h

@@ -16,15 +16,15 @@
 #endif
 
 /*
-	The old Reg32e is split to Reg32, Reg64 and MemOperand
-	Use MemOperand to specify 'rax + rcx * 4 + 123' instead of Reg32e,
+	The old Reg32e is split to Reg32, Reg64 and RegExp
+	Use RegExp to specify 'rax + rcx * 4 + 123' instead of Reg32e,
 	or define XBYAK_USE_OLD_REG32E for compatibility
 
 	XBYAK_USE_OLD_REG32E will be removed in the future version
 
-	old Reg32e = new Reg32e + MemOperand
+	old Reg32e = new Reg32e + RegExp
 	new Reg32e = Reg32 or Reg64
-	MemOperand = Memory Operand such as 'rax + rcx * 4 + 123'
+	RegExp = Memory Operand such as 'rax + rcx * 4 + 123'
 */
 #define XBYAK_USE_OLD_REG32E
 
@@ -472,7 +472,7 @@ struct RegRip {
 };
 #endif
 
-typedef Reg32e MemOperand;
+typedef Reg32e RegExp;
 #else
 #endif