add align

Author: herumi

test/Makefile

@@ -1,7 +1,8 @@
 HEADER=../xbyak_riscv/xbyak_riscv_mnemonic.hpp
 
-test: $(HEADER) jmp_test.exe
+test: $(HEADER) jmp_test.exe misc_test.exe
 	./jmp_test.exe
+	./misc_test.exe
 	./test.sh
 #	./test.sh svc
 

test/misc_test.cpp

@@ -0,0 +1,49 @@
+#include <cybozu/test.hpp>
+#include <xbyak_riscv/xbyak_riscv.hpp>
+
+using namespace Xbyak_riscv;
+
+CYBOZU_TEST_AUTO(align)
+{
+	struct Code : CodeGenerator {
+		Code()
+		{
+			nop();
+			addr1 = getCurr();
+			align(16);
+			addr2 = getCurr();
+			nop();
+			nop();
+			addr3 = getCurr();
+			align(16);
+			addr4 = getCurr();
+			for (int i = 0; i < 4; i++) nop();
+			addr5 = getCurr();
+			// already aligned
+			align(16);
+			addr6 = getCurr();
+
+		}
+		const uint8_t *addr1;
+		const uint8_t *addr2;
+		const uint8_t *addr3;
+		const uint8_t *addr4;
+		const uint8_t *addr5;
+		const uint8_t *addr6;
+	} c;
+	c.ready();
+	printf("addr1=%p\n", c.addr1);
+	printf("addr2=%p\n", c.addr2);
+	printf("addr3=%p\n", c.addr3);
+	printf("addr4=%p\n", c.addr4);
+	printf("addr5=%p\n", c.addr5);
+	printf("addr6=%p\n", c.addr6);
+	CYBOZU_TEST_ASSERT(size_t(c.addr1) % 16);
+	CYBOZU_TEST_ASSERT((size_t(c.addr2) % 16) == 0);
+	CYBOZU_TEST_ASSERT(size_t(c.addr3) % 16);
+	CYBOZU_TEST_ASSERT((size_t(c.addr4) % 16) == 0);
+	CYBOZU_TEST_ASSERT((size_t(c.addr5) % 16) == 0);
+	CYBOZU_TEST_EQUAL(c.addr5, c.addr6);
+}
+
+

xbyak_riscv/xbyak_riscv.hpp

@@ -102,6 +102,7 @@ enum {
 	ERR_CANT_ALLOC,
 	ERR_BAD_PARAMETER,
 	ERR_MUNMAP,
+	ERR_BAD_ALIGN,
 	ERR_INTERNAL // Put it at last.
 };
 
@@ -123,6 +124,7 @@ inline const char *ConvertErrorToString(int err)
 		"can't alloc",
 		"bad parameter",
 		"munmap",
+		"bad align",
 		"internal error"
 	};
 	assert(ERR_INTERNAL == sizeof(errTbl) / sizeof(*errTbl));
@@ -1349,6 +1351,19 @@ class CodeGenerator : public CodeArray {
 	// set read/exec
 	void readyRE() { return ready(PROTECT_RE); }
 
+	void align(size_t x)
+	{
+		if (x == 1) return;
+		if (x < 4 || (x & (x - 1))) XBYAK_RISCV_THROW(ERR_BAD_ALIGN)
+		size_t remain = size_t(getCurr()) % x;
+		if (remain % 4) XBYAK_RISCV_THROW(ERR_INTERNAL)
+		if (remain) {
+			for (size_t i = 0; i < (x - remain) / 4; i++) {
+				nop();
+			}
+		}
+	}
+
 #include "xbyak_riscv_mnemonic.hpp"
 #if defined(XBYAK_RISCV_V) && XBYAK_RISCV_V == 1
 #include "xbyak_riscv_v.hpp"