summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenji Dial <benji3.141@gmail.com>2019-12-22 09:06:25 -0500
committerBenji Dial <benji3.141@gmail.com>2019-12-22 09:06:25 -0500
commit4edc0cb2313541e74026c25b52a8f9685d953a14 (patch)
treee1640e9065d905c92b99b15b208c5076a79ddce6
parent4c2f2fb867cfe64f217a246010a2e2722514dd90 (diff)
downloadportland-os-4edc0cb2313541e74026c25b52a8f9685d953a14.tar.gz
report number of free pages
-rw-r--r--src/kernel/main.c16
-rw-r--r--src/kernel/misc.c46
-rw-r--r--src/kernel/misc.h27
3 files changed, 89 insertions, 0 deletions
diff --git a/src/kernel/main.c b/src/kernel/main.c
index d5f463c..54b0a83 100644
--- a/src/kernel/main.c
+++ b/src/kernel/main.c
@@ -21,6 +21,7 @@ OF THIS SOFTWARE.
#include "files.h"
#include "mem.h"
#include "proc.h"
+#include "misc.h"
void main(void) {
*(uint32_t *)0x0000050c = (uint32_t)allocate_pages(16 * sizeof(struct file_handle_info), 2);
@@ -31,6 +32,21 @@ void main(void) {
for (struct proc_info *i = FILE_HANDLES, *l = FILE_HANDLES + 65536; i < l; ++i)
i->memory_start = 0;
+ uint16_t pages_free = 0, pages_total = 0;
+ for (uint16_t *i = MMAP; i < MMAP + 0x1000; ++i)
+ switch (*i) {
+ case 1:
+ continue;
+ case 0:
+ ++pages_free;
+ default:
+ ++pages_total;
+ }
+ put_16(pages_free);
+ put_sz(" of ");
+ put_16(pages_total);
+ put_sz(" pages free.\n");
+
put_sz("Welcome to Portland version 0.0.8!\n");
while (1)
put_sz("|\b/\b-\b\\\b");
diff --git a/src/kernel/misc.c b/src/kernel/misc.c
new file mode 100644
index 0000000..d002345
--- /dev/null
+++ b/src/kernel/misc.c
@@ -0,0 +1,46 @@
+/*
+Copyright 2019 Benji Dial
+
+Permission to use, copy, modify, and/or distribute this
+software for any purpose with or without fee is hereby
+granted, provided that the above copyright notice and this
+permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS
+ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+OF THIS SOFTWARE.
+*/
+
+#include "misc.h"
+#include "vga.h"
+#include <stdbool.h>
+
+void put_16(uint16_t n) {
+ bool s = false;
+ if (n / 10000) {
+ put_char((uint8_t)'0' + n / 10000);
+ s = true;
+ }
+ n %= 10000;
+ if (n / 1000 || s) {
+ put_char((uint8_t)'0' + n / 1000);
+ s = true;
+ }
+ n %= 1000;
+ if (n / 100 || s) {
+ put_char((uint8_t)'0' + n / 100);
+ s = true;
+ }
+ n %= 100;
+ if (n / 10 || s) {
+ put_char((uint8_t)'0' + n / 10);
+ s = true;
+ }
+ put_char((uint8_t)'0' + n % 10);
+} \ No newline at end of file
diff --git a/src/kernel/misc.h b/src/kernel/misc.h
new file mode 100644
index 0000000..c68bccc
--- /dev/null
+++ b/src/kernel/misc.h
@@ -0,0 +1,27 @@
+/*
+Copyright 2019 Benji Dial
+
+Permission to use, copy, modify, and/or distribute this
+software for any purpose with or without fee is hereby
+granted, provided that the above copyright notice and this
+permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS
+ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+OF THIS SOFTWARE.
+*/
+
+#include <stdint.h>
+
+#ifndef MISC_H
+#define MISC_H
+
+void print_32(uint32_t n);
+
+#endif \ No newline at end of file