diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2001-02-23 22:54:33 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2001-02-23 22:54:33 +0000 |
| commit | 932d1d55cda1f371a6e1a03522c02ae0560e785b (patch) | |
| tree | 012663d2c1dcad983685c339a7cb860f9e34b4b9 /sys/arch/hppa | |
| parent | ff0d01bf9ac9daa76d66ced36273a9da898443e7 (diff) | |
fix damn pcxl damn function
Diffstat (limited to 'sys/arch/hppa')
| -rw-r--r-- | sys/arch/hppa/hppa/locore.S | 6 | ||||
| -rw-r--r-- | sys/arch/hppa/hppa/pmap.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/hppa/hppa/locore.S b/sys/arch/hppa/hppa/locore.S index 8ec4ba41d58..bab62007d17 100644 --- a/sys/arch/hppa/hppa/locore.S +++ b/sys/arch/hppa/hppa/locore.S @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.S,v 1.37 2000/08/15 20:12:15 mickey Exp $ */ +/* $OpenBSD: locore.S,v 1.38 2001/02/23 22:54:32 mickey Exp $ */ /* * Copyright (c) 1998-2000 Michael Shalayeff @@ -1210,8 +1210,8 @@ $sfu_emu /* Compute the hpt entry ptr */ #define HPTENT \ - extru r9, 23, 24, r16 /* r17 = (offset >> 8) */ ! \ - zdep r8, 26, 16, r24 /* r24 = (space << 5) */ ! \ + extru r9, 23, 24, r16 /* r16 = (offset >> 8) */ ! \ + zdep r8, 22, 16, r24 /* r24 = (space << 9) */ ! \ mfctl hptmask, r17 /* r17 = sizeof(HPT)-1 */ ! \ xor r16, r24, r24 /* r24 ^= r16 */ ! \ and r17, r24, r24 /* r24 &= r17 */ ! \ diff --git a/sys/arch/hppa/hppa/pmap.c b/sys/arch/hppa/hppa/pmap.c index 6535a890438..83d39d54371 100644 --- a/sys/arch/hppa/hppa/pmap.c +++ b/sys/arch/hppa/hppa/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.38 2001/01/30 21:44:16 mickey Exp $ */ +/* $OpenBSD: pmap.c,v 1.39 2001/02/23 22:54:32 mickey Exp $ */ /* * Copyright (c) 1998-2000 Michael Shalayeff @@ -217,7 +217,7 @@ pmap_hash(pa_space_t sp, vaddr_t va) struct hpt_entry *hpt; __asm __volatile ( "extru %2, 23, 20, %%r22\n\t" /* r22 = (va >> 8) */ - "zdep %1, 26, 16, %%r23\n\t" /* r23 = (sp << 5) */ + "zdep %1, 22, 16, %%r23\n\t" /* r23 = (sp << 9) */ "dep %%r0, 31, 4, %%r22\n\t" /* r22 &= ~0xf */ "xor %%r22,%%r23, %%r23\n\t" /* r23 ^= r22 */ "mfctl %%cr24, %%r22\n\t" /* r22 = sizeof(HPT)-1 */ |