atomic.cc (5348:7847a4bf9641) | atomic.cc (5408:703f1779cc89) |
---|---|
1/* 2 * Copyright (c) 2002-2005 The Regents of The University of Michigan 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions are 7 * met: redistributions of source code must retain the above copyright 8 * notice, this list of conditions and the following disclaimer; --- 341 unchanged lines hidden (view full) --- 350 351 //If there's a fault, return it 352 if (fault != NoFault) 353 return fault; 354 //If we don't need to access a second cache line, stop now. 355 if (secondAddr <= addr) 356 { 357 data = gtoh(data); | 1/* 2 * Copyright (c) 2002-2005 The Regents of The University of Michigan 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions are 7 * met: redistributions of source code must retain the above copyright 8 * notice, this list of conditions and the following disclaimer; --- 341 unchanged lines hidden (view full) --- 350 351 //If there's a fault, return it 352 if (fault != NoFault) 353 return fault; 354 //If we don't need to access a second cache line, stop now. 355 if (secondAddr <= addr) 356 { 357 data = gtoh(data); |
358 if (traceData) { 359 traceData->setData(data); 360 } |
|
358 return fault; 359 } 360 361 /* 362 * Set up for accessing the second cache line. 363 */ 364 365 //Move the pointer we're reading into to the correct location. --- 197 unchanged lines hidden (view full) --- 563 564 //If there's a fault or we don't need to access a second cache line, 565 //stop now. 566 if (fault != NoFault || secondAddr <= addr) 567 { 568 // If the write needs to have a fault on the access, consider 569 // calling changeStatus() and changing it to "bad addr write" 570 // or something. | 361 return fault; 362 } 363 364 /* 365 * Set up for accessing the second cache line. 366 */ 367 368 //Move the pointer we're reading into to the correct location. --- 197 unchanged lines hidden (view full) --- 566 567 //If there's a fault or we don't need to access a second cache line, 568 //stop now. 569 if (fault != NoFault || secondAddr <= addr) 570 { 571 // If the write needs to have a fault on the access, consider 572 // calling changeStatus() and changing it to "bad addr write" 573 // or something. |
574 if (traceData) { 575 traceData->setData(data); 576 } |
|
571 return fault; 572 } 573 574 /* 575 * Set up for accessing the second cache line. 576 */ 577 578 //Move the pointer we're reading into to the correct location. --- 258 unchanged lines hidden --- | 577 return fault; 578 } 579 580 /* 581 * Set up for accessing the second cache line. 582 */ 583 584 //Move the pointer we're reading into to the correct location. --- 258 unchanged lines hidden --- |