Skip to content
This repository
Browse code

fixed run.sh to work with Arch-installed qemu

  • Loading branch information...
commit 97d954fa454249d71a87e84d3ccde2bd74eafb87 1 parent 24073f0
Nick Johnson authored

Showing 3 changed files with 4 additions and 4 deletions. Show diff stats Hide diff stats

  1. +1 1  driver/pipe/main.c
  2. +2 2 libc/inc/rhombus.h
  3. +1 1  run/run.sh
2  driver/pipe/main.c
@@ -102,7 +102,7 @@ size_t pipe_read(struct robject *self, rp_t source, uint8_t *buffer, size_t size
102 102 datum = pipe_getc(pipe);
103 103
104 104 while (datum == ERR_EMPTY) {
105   - if (robject_get_data(self, "finished")) {
  105 + if (robject_data(self, "finished")) {
106 106 datum = ERR_EOF;
107 107 break;
108 108 }
4 libc/inc/rhombus.h
@@ -63,7 +63,7 @@
63 63 */
64 64
65 65 #define RP_CONS(pid, idx) ((((uint64_t) (idx)) << 32) | (uint64_t) (pid))
66   -#define RP_INDEX(rp) ((uint32_t) ((rp) >> 32))
  66 +#define RP_INDEX(rp) ((uint32_t) ((rp) >> 32) & 0xFFFFFFFF)
67 67 #define RP_PID(rp) ((uint32_t) ((rp) & 0xFFFFFFFF))
68 68 #define RP_HEAD(rp) ((uint64_t) ((rp) & 0xFFFFFFFF))
69 69 #define RP_NULL ((uint64_t) 0)
@@ -81,7 +81,7 @@ rp_t ator(const char *str);
81 81 * File Descriptors
82 82 */
83 83
84   -int fd_alloc(void);
  84 +int fd_alloc (void);
85 85 int fd_set (int fd, rp_t rp, int mode);
86 86 int fd_genkeys(int fd);
87 87 rk_t fd_getkey (int fd, int action);
2  run/run.sh
@@ -3,4 +3,4 @@
3 3 export BUILDDIR=${PWD}
4 4
5 5 #bochs -qf ${BUILDDIR}/run/bochsrc.txt
6   -qemu -cpu qemu32 -cdrom ${BUILDDIR}/run/rhombus.iso -no-reboot -serial stdio -hda ${BUILDDIR}/run/boot.tar
  6 +qemu-system-i386 -cdrom ${BUILDDIR}/run/rhombus.iso -no-reboot -serial stdio -hda ${BUILDDIR}/run/boot.tar

0 comments on commit 97d954f

Please sign in to comment.
Something went wrong with that request. Please try again.