CORE: Fix alignment of instructions

MineGame159 · Jan 27, 2024 · 59d76a5 · 59d76a5
1 parent 263e4c9
commit 59d76a5
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/core/codegen/codegen.go b/core/codegen/codegen.go
@@ -178,7 +178,7 @@ func (c *codegen) load(value exprValue, type_ ast.Type) exprValue {
 			v: c.block.Add(&ir.LoadInst{
 				Typ:     value.v.Type().(*ir.PointerType).Pointee,
 				Pointer: value.v,
-				Align:   type_.Align() * 8,
+				Align:   type_.Align(),
 			}),
 			addressable: false,
 		}

diff --git a/core/codegen/declarations.go b/core/codegen/declarations.go
@@ -57,7 +57,7 @@ func (c *codegen) VisitFunc(decl *ast.Func) {
 		c.block.Add(&ir.StoreInst{
 			Pointer: pointer,
 			Value:   function.Typ.Params[index],
-			Align:   param.Type.Align() * 8,
+			Align:   param.Type.Align(),
 		})
 
 		c.scopes.addVariable(param.Name, param.Type, exprValue{v: pointer}, uint32(index+1))

diff --git a/core/codegen/expressions.go b/core/codegen/expressions.go
@@ -190,7 +190,7 @@ func (c *codegen) VisitStructInitializer(expr *ast.StructInitializer) {
 		c.block.Add(&ir.StoreInst{
 			Pointer: pointer,
 			Value:   result,
-			Align:   struct_.Align() * 8,
+			Align:   struct_.Align(),
 		})
 
 		c.exprResult = exprValue{v: pointer}
@@ -285,7 +285,7 @@ func (c *codegen) VisitUnary(expr *ast.Unary) {
 				result = c.block.Add(&ir.LoadInst{
 					Typ:     result.Type().(*ir.PointerType).Pointee,
 					Pointer: result,
-					Align:   expr.Result().Type.Align() * 8,
+					Align:   expr.Result().Type.Align(),
 				})
 			}
 
@@ -314,7 +314,7 @@ func (c *codegen) VisitUnary(expr *ast.Unary) {
 			c.block.Add(&ir.StoreInst{
 				Pointer: value.v,
 				Value:   newValue.v,
-				Align:   expr.Value.Result().Type.Align() * 8,
+				Align:   expr.Value.Result().Type.Align(),
 			})
 
 			result = newValue.v
@@ -356,7 +356,7 @@ func (c *codegen) VisitUnary(expr *ast.Unary) {
 			c.block.Add(&ir.StoreInst{
 				Pointer: value.v,
 				Value:   newValue.v,
-				Align:   expr.Value.Result().Type.Align() * 8,
+				Align:   expr.Value.Result().Type.Align(),
 			})
 
 			result = prevValue.v
@@ -514,7 +514,7 @@ func (c *codegen) VisitAssignment(expr *ast.Assignment) {
 	store := c.block.Add(&ir.StoreInst{
 		Pointer: assignee.v,
 		Value:   value.v,
-		Align:   expr.Result().Type.Align() * 8,
+		Align:   expr.Result().Type.Align(),
 	})
 
 	c.setLocationMeta(store, expr)
@@ -667,7 +667,7 @@ func (c *codegen) VisitCall(expr *ast.Call) {
 		c.block.Add(&ir.StoreInst{
 			Pointer: pointer.v,
 			Value:   c.exprResult.v,
-			Align:   function.Returns.Align() * 8,
+			Align:   function.Returns.Align(),
 		})
 
 		c.exprResult = pointer
@@ -682,7 +682,7 @@ func (c *codegen) VisitIndex(expr *ast.Index) {
 		value = exprValue{v: c.block.Add(&ir.LoadInst{
 			Typ:     value.v.Type().(*ir.PointerType).Pointee,
 			Pointer: value.v,
-			Align:   pointer.Pointee.Align() * 8,
+			Align:   pointer.Pointee.Align(),
 		})}
 	}
 
@@ -834,7 +834,7 @@ func (c *codegen) VisitMember(expr *ast.Member) {
 				c.block.Add(&ir.StoreInst{
 					Pointer: pointer.v,
 					Value:   value.v,
-					Align:   node.Align() * 8,
+					Align:   node.Align(),
 				})
 
 				value = pointer
@@ -865,7 +865,7 @@ func (c *codegen) memberLoad(type_ ast.Type, value exprValue) (exprValue, *ast.S
 			load := c.block.Add(&ir.LoadInst{
 				Typ:     value.v.Type().(*ir.PointerType).Pointee,
 				Pointer: value.v,
-				Align:   v.Align() * 8,
+				Align:   v.Align(),
 			})
 
 			return exprValue{

diff --git a/core/codegen/instructions.go b/core/codegen/instructions.go
@@ -8,7 +8,7 @@ import (
 func (c *codegen) alloca(type_ ast.Type, name string, node ast.Node) ir.Value {
 	pointer := c.block.Add(&ir.AllocaInst{
 		Typ:   c.types.get(type_),
-		Align: type_.Align() * 8,
+		Align: type_.Align(),
 	})
 
 	if name != "" {

diff --git a/core/codegen/statements.go b/core/codegen/statements.go
@@ -36,7 +36,7 @@ func (c *codegen) VisitVar(stmt *ast.Var) {
 	store := c.block.Add(&ir.StoreInst{
 		Pointer: pointer.v,
 		Value:   initializer,
-		Align:   stmt.ActualType.Align() * 8,
+		Align:   stmt.ActualType.Align(),
 	})
 
 	c.setLocationMeta(store, stmt)