diff options
| author | Charles.Forsyth <devnull@localhost> | 2007-12-18 09:44:28 +0000 |
|---|---|---|
| committer | Charles.Forsyth <devnull@localhost> | 2007-12-18 09:44:28 +0000 |
| commit | 45a14cc6b60b02e58eb1b271508ccc2fa3c52b8f (patch) | |
| tree | 91950c4ad9aa5a856283b93f701b3963fa891d46 | |
| parent | ac53509e2be27b6223bb0396f49e9c0dd3d32a27 (diff) | |
20071218-0950
| -rw-r--r-- | emu/port/dev.c | 4 | ||||
| -rw-r--r-- | emu/port/devmnt.c | 3 | ||||
| -rw-r--r-- | include/version.h | 2 | ||||
| -rw-r--r-- | utils/libmach/qdb.c | 12 |
4 files changed, 11 insertions, 10 deletions
diff --git a/emu/port/dev.c b/emu/port/dev.c index 5df62ecc..ee4053aa 100644 --- a/emu/port/dev.c +++ b/emu/port/dev.c @@ -102,7 +102,6 @@ devclone(Chan *c) panic("clone of open file type %C\n", devtab[c->type]->dc); nc = newchan(); - nc->type = c->type; nc->dev = c->dev; nc->mode = c->mode; @@ -119,7 +118,8 @@ devclone(Chan *c) Walkqid* devwalk(Chan *c, Chan *nc, char **name, int nname, Dirtab *tab, int ntab, Devgen *gen) { - int i, j, alloc; + int i, j; + volatile int alloc; Walkqid *wq; char *n; Dir dir; diff --git a/emu/port/devmnt.c b/emu/port/devmnt.c index 0d490625..6a18dd0a 100644 --- a/emu/port/devmnt.c +++ b/emu/port/devmnt.c @@ -379,7 +379,8 @@ mntchan(void) static Walkqid* mntwalk(Chan *c, Chan *nc, char **name, int nname) { - int i, alloc; + volatile int alloc; + int i; Mnt *m; Mntrpc *r; Walkqid *wq; diff --git a/include/version.h b/include/version.h index 107488ef..7af48044 100644 --- a/include/version.h +++ b/include/version.h @@ -1 +1 @@ -#define VERSION "Fourth Edition (20071214)" +#define VERSION "Fourth Edition (20071218)" diff --git a/utils/libmach/qdb.c b/utils/libmach/qdb.c index f2aa682a..890408b1 100644 --- a/utils/libmach/qdb.c +++ b/utils/libmach/qdb.c @@ -609,7 +609,7 @@ sub(Opcode *o, Instr *i) } static void -qdiv(Opcode *o, Instr *i) +qmuldiv(Opcode *o, Instr *i) { format(o->mnemonic, i, 0); if(i->op == 31) @@ -754,10 +754,10 @@ static Opcode opcodes[] = { {31, 246, ALL, "DCBTST", dcb, 0}, {31, 1014, ALL, "DCBZ", dcb, 0}, - {31, 331, OEM, "DIV%V%C", qdiv, ir3}, /* POWER */ - {31, 363, OEM, "DIVS%V%C", qdiv, ir3}, /* POWER */ - {31, 491, OEM, "DIVW%V%C", qdiv, ir3}, - {31, 459, OEM, "DIVWU%V%C", qdiv, ir3}, + {31, 331, OEM, "DIV%V%C", qmuldiv, ir3}, /* POWER */ + {31, 363, OEM, "DIVS%V%C", qmuldiv, ir3}, /* POWER */ + {31, 491, OEM, "DIVW%V%C", qmuldiv, ir3}, + {31, 459, OEM, "DIVWU%V%C", qmuldiv, ir3}, {31, 264, OEM, "DOZ%V%C", gencc, ir3r}, /* POWER */ {9, 0, 0, "DOZ", gen, ir2i}, /* POWER */ @@ -860,7 +860,7 @@ static Opcode opcodes[] = { {31, 11, ALL, "MULHWU%C", gencc, ir3}, /* POWER */ {31, 235, OEM, "MULLW%V%C", gencc, ir3}, - {7, 0, 0, "MULLW", qdiv, "%i,R%a,R%d"}, + {7, 0, 0, "MULLW", qmuldiv, "%i,R%a,R%d"}, {31, 488, OEM, "NABS%V%C", neg, ir2}, /* POWER */ |