mem.isa (10666:3c42be107634) | mem.isa (11303:f694764d656d) |
---|---|
1// -*- mode:c++ -*- 2 3// Copyright (c) 2010, 2012, 2014 ARM Limited 4// All rights reserved 5// 6// The license below extends only to copyright in the software and shall 7// not be construed as granting a license to any other intellectual 8// property including but not limited to intellectual property relating --- 424 unchanged lines hidden (view full) --- 433 434 %(op_src_decl)s; 435 %(op_rd)s; 436 %(ea_code)s; 437 438 if (%(predicate_test)s) 439 { 440 if (fault == NoFault) { | 1// -*- mode:c++ -*- 2 3// Copyright (c) 2010, 2012, 2014 ARM Limited 4// All rights reserved 5// 6// The license below extends only to copyright in the software and shall 7// not be construed as granting a license to any other intellectual 8// property including but not limited to intellectual property relating --- 424 unchanged lines hidden (view full) --- 433 434 %(op_src_decl)s; 435 %(op_rd)s; 436 %(ea_code)s; 437 438 if (%(predicate_test)s) 439 { 440 if (fault == NoFault) { |
441 fault = readMemTiming(xc, traceData, EA, Mem, memAccessFlags); | 441 fault = initiateMemRead(xc, traceData, EA, Mem, 442 memAccessFlags); |
442 } 443 } else { 444 xc->setPredicate(false); 445 } 446 447 return fault; 448 } 449}}; --- 6 unchanged lines hidden (view full) --- 456 Addr EA; 457 Fault fault = NoFault; 458 459 %(op_decl)s; 460 %(mem_decl)s; 461 %(op_rd)s; 462 %(ea_code)s; 463 | 443 } 444 } else { 445 xc->setPredicate(false); 446 } 447 448 return fault; 449 } 450}}; --- 6 unchanged lines hidden (view full) --- 457 Addr EA; 458 Fault fault = NoFault; 459 460 %(op_decl)s; 461 %(mem_decl)s; 462 %(op_rd)s; 463 %(ea_code)s; 464 |
464 MemUnion memUnion; 465 uint8_t *dataPtr = memUnion.bytes; 466 | |
467 if (%(predicate_test)s) 468 { 469 if (fault == NoFault) { | 465 if (%(predicate_test)s) 466 { 467 if (fault == NoFault) { |
470 fault = xc->readMem(EA, dataPtr, %(size)d, memAccessFlags); | 468 fault = xc->initiateMemRead(EA, %(size)d, memAccessFlags); |
471 } 472 } else { 473 xc->setPredicate(false); 474 } 475 476 return fault; 477 } 478}}; --- 788 unchanged lines hidden --- | 469 } 470 } else { 471 xc->setPredicate(false); 472 } 473 474 return fault; 475 } 476}}; --- 788 unchanged lines hidden --- |