shithub: sl

Info  •  Files  •  Log  •  Branches

closure op: align function on 32-bit systems

Previous refactoring made the function pointer misaligned
in some cases. This commit fixes the issue.

--- a/src/vm.inc

+++ b/src/vm.inc

@@ -245,7 +245,12 @@

 OP(OP_CLOSURE) {

 	uint32_t x = *ip++;

 	assert(x > 0);

-	value_t *pv = alloc_words(1+x + sizeof(function_t)/sizeof(value_t));

+	value_t *pv = alloc_words(

+		1+x+

+#if !defined(BITS64)

+		!(x&1)+

+#endif

+		sizeof(function_t)/sizeof(value_t));

 	value_t v = tagptr(pv, TAG_VECTOR);

 	*pv++ = fixnum(x);

 	for(uint32_t i = 0; i < x; i++)

@@ -252,6 +257,10 @@

 		*pv++ = FL(stack)[FL(sp)-x+i];

 	POPN(x);

 	PUSH(v);

+#if !defined(BITS64)

+	if((x & 1) == 0)

+		pv++;

+#endif

 	function_t *f = (function_t*)pv;

 	value_t e = FL(stack)[FL(sp)-2];  // closure to copy

 	assert(isfunction(e));