Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 888 → Rev 889

/kernel/branches/kolibri_pe/include/core.h
92,7 → 92,7
);
}
 
static inline void _btr(u32_t *data, count_t val)
extern inline void _btr(u32_t *data, count_t val)
{
asm volatile ("btr %0, %1 \n\t"
:
100,3 → 100,22
:"cc"
);
}
 
extern inline void* load_file(const char *path, size_t *size)
{
void* retval;
size_t tmp;
 
__asm__ __volatile__ (
"pushl %%eax \n\t"
"call _load_file@4 \n\t"
:"=eax" (retval), "=ebx"(tmp)
:"a" (path) );
 
if(size)
*size = tmp;
return retval;
};
 
 
//extern __fastcall void* load_file(const char *path, size_t *size);
/kernel/branches/kolibri_pe/include/mm.h
22,16 → 22,27
int flags;
} zone_t;
 
 
typedef struct
{
count_t count;
addr_t frames[18];
}phismem_t;
link_t link;
link_t adj;
addr_t base;
size_t size;
void *parent;
u32_t state;
}md_t;
 
 
#define PG_MAP 1
#define PG_WRITE 2
#define PG_USER 4
 
#define PG_SW 3
#define PG_UW 7
 
 
 
#define PAGE_SIZE 4096
#define FRAME_WIDTH 12
 
60,15 → 71,19
 
void init_mm();
 
void* __fastcall frame_get_parent(pfn_t pfn);
void __fastcall frame_set_parent(pfn_t pfn, void *data);
 
void frame_free(pfn_t frame);
 
 
addr_t __fastcall core_alloc(u32_t order);
void __fastcall core_free(addr_t frame);
 
pfn_t alloc_page() __attribute__ ((deprecated));
pfn_t __stdcall alloc_pages(count_t count) __asm__ ("_alloc_pages") __attribute__ ((deprecated));
 
void frame_free(pfn_t frame);
 
void __fastcall frame_set_parent(pfn_t pfn, void *data);
void* __fastcall frame_get_parent(pfn_t pfn);
md_t* __fastcall md_alloc(size_t size, u32_t flags);
void* __fastcall mem_alloc(size_t size, u32_t flags);
void __fastcall mem_free(void *mem);
 
void* __fastcall mem_alloc(size_t size, u32_t flags) ;