Skip to content

Commit e5eb83d

Browse files
Changed the alignment of allocations back to 8 bytes.
1 parent 762f1ef commit e5eb83d

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

arch/m68k-all/include/aros/cpu.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#define AROS_PTRALIGN 2 /* Alignment for PTR */
2424
#define AROS_IPTRALIGN 2 /* Alignment for IPTR */
2525
#define AROS_DOUBLEALIGN 2 /* Alignment for double */
26-
#define AROS_WORSTALIGN 32 /* Worst case alignment - ApolloOS = 32 Bytes */
26+
#define AROS_WORSTALIGN 4 /* Worst case alignment - ApolloOS = 32 Bytes */
2727

2828
#define AROS_SLOWSTACKFORMAT 1
2929

compiler/include/aros/cpu.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
#define AROS_PTRALIGN 8 /* Alignment for PTR */
5151
#define AROS_IPTRALIGN 8 /* Alignment for IPTR */
5252
#define AROS_DOUBLEALIGN 8 /* Alignment for double */
53-
#define AROS_WORSTALIGN 32 /* Worst case alignment */
53+
#define AROS_WORSTALIGN 4 /* Worst case alignment */
5454
#define AROS_STACKALIGN 16 /* Clean stack alignment */
5555
#elif defined __arm__
5656
# if defined __thumb2__

compiler/include/exec/memory.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ struct MemChunk
3030
};
3131

3232
/* Total size of struct MemChunk, including padding */
33-
#define MEMCHUNK_TOTAL 32 //[WD] ApolloOS is set to 32 Byte Memory Boundary from Core 11350+ | (AROS_WORSTALIGN > sizeof(struct MemChunk) ? AROS_WORSTALIGN : sizeof(struct MemChunk))
33+
#define MEMCHUNK_TOTAL (AROS_WORSTALIGN > sizeof(struct MemChunk) ? AROS_WORSTALIGN : sizeof(struct MemChunk))
3434
/* Total size of struct MemHeader, including padding */
3535
#define MEMHEADER_TOTAL (AROS_ROUNDUP2(sizeof(struct MemHeader), MEMCHUNK_TOTAL))
3636

0 commit comments

Comments
 (0)