From e28e185032a9204a235a0b9df0f4ab444af013e7 Mon Sep 17 00:00:00 2001 From: Miod Vallat Date: Mon, 9 Apr 2012 16:56:22 +0000 Subject: No need to round VCEI addresses, and VCED addresses only need to be rounded to a word boundary. --- sys/arch/mips64/mips64/trap.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/arch/mips64/mips64/trap.c b/sys/arch/mips64/mips64/trap.c index 73aa524bcf7..bddc051fd55 100644 --- a/sys/arch/mips64/mips64/trap.c +++ b/sys/arch/mips64/mips64/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.78 2012/03/28 20:44:23 miod Exp $ */ +/* $OpenBSD: trap.c,v 1.79 2012/04/09 16:56:21 miod Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -767,8 +767,7 @@ printf("SIG-BUSB @%p pc %p, ra %p\n", trapframe->badvaddr, trapframe->pc, trapfr case T_VCEI: case T_VCEI+T_USER: { - vaddr_t va = trapframe->badvaddr & - ~((vaddr_t)ci->ci_l1instcacheline - 1); + vaddr_t va = trapframe->badvaddr; #ifdef DEBUG printf("VCEI trap, badvaddr %p\n", trapframe->badvaddr); #endif @@ -781,8 +780,7 @@ printf("SIG-BUSB @%p pc %p, ra %p\n", trapframe->badvaddr, trapframe->pc, trapfr case T_VCED: case T_VCED+T_USER: { - vaddr_t va = trapframe->badvaddr & - ~((vaddr_t)ci->ci_l1datacacheline - 1); + vaddr_t va = trapframe->badvaddr & ~3; #ifdef DEBUG printf("VCED trap, badvaddr %p\n", trapframe->badvaddr); #endif -- cgit v1.2.3