From 97ced37c7150e53cdc50a19adac7de39b76dad9b Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sat, 9 Apr 2005 16:13:19 +0000 Subject: [PATCH] Need to provide sizeof(struct free_base_memory_header) to assembly code. --- src/arch/i386/include/basemem.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/arch/i386/include/basemem.h b/src/arch/i386/include/basemem.h index 19f95bf6..84c7a490 100644 --- a/src/arch/i386/include/basemem.h +++ b/src/arch/i386/include/basemem.h @@ -1,10 +1,33 @@ #ifndef BASEMEM_H #define BASEMEM_H +#ifdef ASSEMBLY + +/* Must match sizeof(struct free_base_memory_header) */ +#define FREE_BASEMEM_HEADER_SIZE 8 + +#else /* ASSEMBLY */ + #include "stdint.h" +/* Structures that we use to represent a free block of base memory */ + +#define FREE_BLOCK_MAGIC ( ('!'<<0) + ('F'<<8) + ('R'<<16) + ('E'<<24) ) +struct free_base_memory_header { + uint32_t magic; + uint32_t size_kb; +}; + +union free_base_memory_block { + struct free_base_memory_header; + char bytes[1024]; +}; + +/* Function prototypes */ extern uint32_t get_free_base_memory ( void ); extern void * alloc_base_memory ( size_t size ); extern void free_base_memory ( void *ptr, size_t size ); +#endif /* ASSEMBLY */ + #endif /* BASEMEM_H */