CPUARMState is 16-bytes aligned

wtdcode · wtdcode · commit f2227f566721 · 2024-10-17T13:00:18.000+08:00
diff --git a/qemu/target/arm/cpu.c b/qemu/target/arm/cpu.c
@@ -2102,7 +2102,8 @@ ARMCPU *cpu_arm_init(struct uc_struct *uc)
     CPUClass *cc;
     CPUARMState *env;
 
-    cpu = calloc(1, sizeof(*cpu));
+    // cpu->env is 16 bytes aligned
+    cpu = aligned_alloc(16, sizeof(*cpu));
     if (cpu == NULL) {
         return NULL;
     }
diff --git a/qemu/target/arm/cpu64.c b/qemu/target/arm/cpu64.c
@@ -325,7 +325,8 @@ ARMCPU *cpu_aarch64_init(struct uc_struct *uc)
     CPUClass *cc;
     CPUARMState *env;
 
-    cpu = calloc(1, sizeof(*cpu));
+    // cpu->env is 16 bytes alignment
+    cpu = aligned_alloc(16, sizeof(*cpu));
     if (cpu == NULL) {
         return NULL;
     }

Original file line number	Diff line number	Diff line change
`@@ -2102,7 +2102,8 @@ ARMCPU cpu_arm_init(struct uc_struct uc)`
`2102`	`2102`	`CPUClass *cc;`
`2103`	`2103`	`CPUARMState *env;`
`2104`	`2104`
`2105`		`- cpu = calloc(1, sizeof(*cpu));`
	`2105`	`+ // cpu->env is 16 bytes aligned`
	`2106`	`+ cpu = aligned_alloc(16, sizeof(*cpu));`
`2106`	`2107`	`if (cpu == NULL) {`
`2107`	`2108`	`return NULL;`
`2108`	`2109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,8 @@ ARMCPU cpu_aarch64_init(struct uc_struct uc)`
`325`	`325`	`CPUClass *cc;`
`326`	`326`	`CPUARMState *env;`
`327`	`327`
`328`		`- cpu = calloc(1, sizeof(*cpu));`
	`328`	`+ // cpu->env is 16 bytes alignment`
	`329`	`+ cpu = aligned_alloc(16, sizeof(*cpu));`
`329`	`330`	`if (cpu == NULL) {`
`330`	`331`	`return NULL;`
`331`	`332`	`}`