tlb.cc (5417:84755f1f32d3) | tlb.cc (5418:501cb81c89df) |
---|---|
1/* 2 * Copyright (c) 2007-2008 The Hewlett-Packard Development Company 3 * All rights reserved. 4 * 5 * Redistribution and use of this software in source and binary forms, 6 * with or without modification, are permitted provided that the 7 * following conditions are met: 8 * --- 192 unchanged lines hidden (view full) --- 201 202 //XXX Junk code to surpress the warning 203 if (storeCheck); 204 205 // If this is true, we're dealing with a request to read an internal 206 // value. 207 if (seg == SEGMENT_REG_MS) { 208 DPRINTF(TLB, "Addresses references internal memory.\n"); | 1/* 2 * Copyright (c) 2007-2008 The Hewlett-Packard Development Company 3 * All rights reserved. 4 * 5 * Redistribution and use of this software in source and binary forms, 6 * with or without modification, are permitted provided that the 7 * following conditions are met: 8 * --- 192 unchanged lines hidden (view full) --- 201 202 //XXX Junk code to surpress the warning 203 if (storeCheck); 204 205 // If this is true, we're dealing with a request to read an internal 206 // value. 207 if (seg == SEGMENT_REG_MS) { 208 DPRINTF(TLB, "Addresses references internal memory.\n"); |
209 Addr prefix = vaddr & IntAddrPrefixMask; | 209 Addr prefix = (vaddr >> 3) & IntAddrPrefixMask; |
210 if (prefix == IntAddrPrefixCPUID) { 211 panic("CPUID memory space not yet implemented!\n"); 212 } else if (prefix == IntAddrPrefixMSR) { | 210 if (prefix == IntAddrPrefixCPUID) { 211 panic("CPUID memory space not yet implemented!\n"); 212 } else if (prefix == IntAddrPrefixMSR) { |
213 vaddr = vaddr >> 3; |
|
213 req->setMmapedIpr(true); 214 Addr regNum = 0; 215 switch (vaddr & ~IntAddrPrefixMask) { 216 case 0x10: 217 regNum = MISCREG_TSC; 218 break; 219 case 0x1B: 220 regNum = MISCREG_APIC_BASE; --- 594 unchanged lines hidden --- | 214 req->setMmapedIpr(true); 215 Addr regNum = 0; 216 switch (vaddr & ~IntAddrPrefixMask) { 217 case 0x10: 218 regNum = MISCREG_TSC; 219 break; 220 case 0x1B: 221 regNum = MISCREG_APIC_BASE; --- 594 unchanged lines hidden --- |