Make ncdu happen

mehfooz09 · Apr 20, 2018 · 4a8c3ea · 4a8c3ea
1 parent ea51f93
commit 4a8c3ea
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 4 deletions.
diff --git a/app/AppDelegate.m b/app/AppDelegate.m
@@ -45,7 +45,7 @@ - (int)startThings {
     create_first_process();
     char *program = "/bin/login";
     char *argv[] = {program, "root", NULL};
-    char *envp[] = {NULL};
+    char *envp[] = {"TERM=xterm-256color", NULL};
     err = sys_execve(program, argv, envp);
     if (err < 0)
         return err;

diff --git a/app/Terminal.m b/app/Terminal.m
@@ -85,8 +85,9 @@ - (void)refresh {
 
     NSError *err = nil;
     NSData *jsonData = [NSJSONSerialization dataWithJSONObject:@[str] options:0 error:&err];
+    NSString *json = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
     NSAssert(err == nil, @"JSON serialization failed, wtf");
-    NSString *jsToEvaluate = [NSString stringWithFormat:@"term.write(%@[0])", [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding]];
+    NSString *jsToEvaluate = [NSString stringWithFormat:@"term.write(%@[0])", json];
     [self.webView evaluateJavaScript:jsToEvaluate completionHandler:nil];
 }
 

diff --git a/app/xtermjs/term.html b/app/xtermjs/term.html
@@ -1,4 +1,5 @@
 <!doctype html>
+<meta charset="utf-8">
 <meta name="viewport" content="user-scalable=no, height=device-height, initial-scale=1.0">
 <div id="terminal"></div>
 <script src="term.js"></script>
diff --git a/emu/decode.h b/emu/decode.h
@@ -544,6 +544,7 @@ __no_instrument int glue(decoder_name, OP_SIZE)(struct cpu_state *cpu, struct tl
                     case 0xd80: TRACE("fadd mem32"); FADDM(mem_addr_real,32); break;
                     case 0xd81: TRACE("fmul mem32"); FMULM(mem_addr_real,32); break;
                     case 0xd86: TRACE("fdiv mem32"); FDIVM(mem_addr_real,32); break;
+                    case 0xd87: TRACE("fdivr mem32"); FDIVRM(mem_addr_real,32); break;
                     case 0xd90: TRACE("fld mem32"); FLDM(mem_addr_real,32); break;
                     case 0xd93: TRACE("fstp mem32"); FSTM(mem_addr_real,32); FPOP; break;
                     case 0xd95: TRACE("fldcw mem16"); FLDCW(mem_addr); break;

diff --git a/emu/interp/fpu.h b/emu/interp/fpu.h
@@ -66,6 +66,8 @@ static inline extFloat80_t extF80_abs(extFloat80_t f) {
     ST(0) = extF80_div(ST(0), i64_to_extF80((sint(z)) get(val,z)))
 #define FDIVM(val,z) \
     ST(0) = extF80_div(ST(0), f_to_extF80(get(val,z),z))
+#define FDIVRM(val,z) \
+    ST(0) = extF80_div(f_to_extF80(get(val,z),z), ST(0))
 
 #define FCHS() \
     ST(0) = extF80_neg(ST(0))

diff --git a/kernel/calls.c b/kernel/calls.c
@@ -134,10 +134,10 @@ void handle_interrupt(int interrupt) {
             cpu->eax = result;
         }
     } else if (interrupt == INT_GPF) {
-        println("page fault at %x", cpu->segfault_addr);
+        println("page fault at 0x%x", cpu->segfault_addr);
         deliver_signal(current, SIGSEGV_);
     } else if (interrupt == INT_UNDEFINED) {
-        println("illegal instruction");
+        println("illegal instruction at 0x%x", cpu->eip);
         deliver_signal(current, SIGILL_);
     } else if (interrupt != INT_TIMER) {
         println("exiting");