Merge branch 'nivas-x86-master' into dev

herumi · Jan 31, 2024 · 1201541 · 1201541
2 parents 086530e + 1d75fb3
commit 1201541
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/xbyak/xbyak.h b/xbyak/xbyak.h
@@ -3215,7 +3215,7 @@ class CodeGenerator : public CodeArray {
 	{
 		if (x == 1) return;
 		if (x < 1 || (x & (x - 1))) XBYAK_THROW(ERR_BAD_ALIGN)
-		if (isAutoGrow()) XBYAK_THROW(ERR_BAD_ALIGN)
+		if (isAutoGrow() && inner::getPageSize() % x != 0) XBYAK_THROW(ERR_BAD_ALIGN)
 		size_t remain = size_t(getCurr()) % x;
 		if (remain) {
 			nop(x - remain, useMultiByteNop);