mem.isa (8442:b1f3dfae06f1) | mem.isa (8444:56de1f9320df) |
---|---|
1// -*- mode:c++ -*- 2 3// Copyright (c) 2010 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 --- 195 unchanged lines hidden (view full) --- 204 %(ea_code)s; 205 206 MemUnion memUnion; 207 uint8_t *dataPtr = memUnion.bytes; 208 209 if (%(predicate_test)s) 210 { 211 if (fault == NoFault) { | 1// -*- mode:c++ -*- 2 3// Copyright (c) 2010 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 --- 195 unchanged lines hidden (view full) --- 204 %(ea_code)s; 205 206 MemUnion memUnion; 207 uint8_t *dataPtr = memUnion.bytes; 208 209 if (%(predicate_test)s) 210 { 211 if (fault == NoFault) { |
212 fault = xc->readBytes(EA, dataPtr, %(size)d, memAccessFlags); | 212 fault = xc->readMem(EA, dataPtr, %(size)d, memAccessFlags); |
213 %(memacc_code)s; 214 } 215 216 if (fault == NoFault) { 217 %(op_wb)s; 218 } 219 } else { 220 xc->setPredicate(false); --- 54 unchanged lines hidden (view full) --- 275 276 if (%(predicate_test)s) 277 { 278 if (fault == NoFault) { 279 %(memacc_code)s; 280 } 281 282 if (fault == NoFault) { | 213 %(memacc_code)s; 214 } 215 216 if (fault == NoFault) { 217 %(op_wb)s; 218 } 219 } else { 220 xc->setPredicate(false); --- 54 unchanged lines hidden (view full) --- 275 276 if (%(predicate_test)s) 277 { 278 if (fault == NoFault) { 279 %(memacc_code)s; 280 } 281 282 if (fault == NoFault) { |
283 fault = xc->writeBytes(dataPtr, %(size)d, EA, 284 memAccessFlags, NULL); | 283 fault = xc->writeMem(dataPtr, %(size)d, EA, 284 memAccessFlags, NULL); |
285 } 286 287 if (fault == NoFault) { 288 %(op_wb)s; 289 } 290 } else { 291 xc->setPredicate(false); 292 } --- 115 unchanged lines hidden (view full) --- 408 if (%(predicate_test)s) 409 { 410 MemUnion memUnion; 411 if (fault == NoFault) { 412 %(memacc_code)s; 413 } 414 415 if (fault == NoFault) { | 285 } 286 287 if (fault == NoFault) { 288 %(op_wb)s; 289 } 290 } else { 291 xc->setPredicate(false); 292 } --- 115 unchanged lines hidden (view full) --- 408 if (%(predicate_test)s) 409 { 410 MemUnion memUnion; 411 if (fault == NoFault) { 412 %(memacc_code)s; 413 } 414 415 if (fault == NoFault) { |
416 fault = xc->writeBytes(memUnion.bytes, %(size)d, EA, 417 memAccessFlags, NULL); | 416 fault = xc->writeMem(memUnion.bytes, %(size)d, EA, 417 memAccessFlags, NULL); |
418 } 419 } else { 420 xc->setPredicate(false); 421 } 422 423 return fault; 424 } 425}}; --- 36 unchanged lines hidden (view full) --- 462 %(ea_code)s; 463 464 MemUnion memUnion; 465 uint8_t *dataPtr = memUnion.bytes; 466 467 if (%(predicate_test)s) 468 { 469 if (fault == NoFault) { | 418 } 419 } else { 420 xc->setPredicate(false); 421 } 422 423 return fault; 424 } 425}}; --- 36 unchanged lines hidden (view full) --- 462 %(ea_code)s; 463 464 MemUnion memUnion; 465 uint8_t *dataPtr = memUnion.bytes; 466 467 if (%(predicate_test)s) 468 { 469 if (fault == NoFault) { |
470 fault = xc->readBytes(EA, dataPtr, %(size)d, memAccessFlags); | 470 fault = xc->readMem(EA, dataPtr, %(size)d, memAccessFlags); |
471 } 472 } else { 473 xc->setPredicate(false); 474 } 475 476 return fault; 477 } 478}}; --- 726 unchanged lines hidden --- | 471 } 472 } else { 473 xc->setPredicate(false); 474 } 475 476 return fault; 477 } 478}}; --- 726 unchanged lines hidden --- |