Skip to content

Commit

Permalink
DESTROY EVERYTHING AND TRY AGAIN. HASHTAG YOLO HASHTAG YOLOGRAMMING H…
Browse files Browse the repository at this point in the history
…ASHTAG FUCKIT
  • Loading branch information
duckinator committed Jan 3, 2018
1 parent b31eae6 commit fc19764
Show file tree
Hide file tree
Showing 13 changed files with 29 additions and 435 deletions.
51 changes: 0 additions & 51 deletions CONTRIBUTORS.txt

This file was deleted.

3 changes: 1 addition & 2 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
Copyright (c) 2008-2017, Ellen Dash <[email protected]> and the contributors
contributors (listed in the CONTRIBUTORS.txt file).
Copyright (c) 2017 awooOS/dmm contributors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# dux-mm
# dmm

a memory management library pulled from
[dux](https://github.com/duckinator/dux).
A memory management library made for
[awooOS](https://github.com/awooos/awooos).

# License

The code is available as open source under the [MIT
License](https://github.com/duckinator/dux-mm/raw/master/LICENSE.txt).
License](https://github.com/awoos/dmm/raw/master/LICENSE.txt).
17 changes: 12 additions & 5 deletions include/dmm.h
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
#ifndef DUX_DMM_H
#define DUX_DMM_H
#ifndef DMM_H
#define DMM_H

#include <stddef.h>

void dmm_init(size_t _kernel_end, size_t _end_memory);
void *kmalloc(size_t nbytes);
void kfree(void *ap);
void dmm_add_memory_region(void *start, size_t length);
void *dmm_malloc(size_t size);
void dmm_free(void *ptr);

// If the DMM_INTRUSIVE macro is defined, alias malloc() and free()
// to the dmm ones.
#ifdef DMM_INTRUSIVE
#define malloc dmm_malloc
#define free dmm_free
#endif

#endif
96 changes: 0 additions & 96 deletions src/frames.c

This file was deleted.

16 changes: 0 additions & 16 deletions src/frames.h

This file was deleted.

19 changes: 12 additions & 7 deletions src/main.c
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
#include <dmm.h>
#include <stddef.h>
#include "placement_allocator.h"
#include "frames.h"
#include "paging.h"

void dmm_init(size_t last_used_address, size_t end_memory)
void dmm_add_memory_region(void *start, size_t length)
{
dmm_frames_init(end_memory);
dmm_paging_init();
dmm_placement_allocator_init(last_used_address);
//
}

void *dmm_malloc(size_t size)
{
//
}

void dmm_free(void *ptr)
{
//
}
94 changes: 0 additions & 94 deletions src/nicer_allocator.c

This file was deleted.

21 changes: 0 additions & 21 deletions src/nicer_allocator.h

This file was deleted.

Loading

0 comments on commit fc19764

Please sign in to comment.