timing.cc (10653:e3fc6bc7f97e) timing.cc (10665:aef704eaedd2)
1/*
2 * Copyright 2014 Google, Inc.
3 * Copyright (c) 2010-2013 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

--- 388 unchanged lines hidden (view full) ---

397{
398 Fault fault;
399 const int asid = 0;
400 const ThreadID tid = 0;
401 const Addr pc = thread->instAddr();
402 unsigned block_size = cacheLineSize();
403 BaseTLB::Mode mode = BaseTLB::Read;
404
1/*
2 * Copyright 2014 Google, Inc.
3 * Copyright (c) 2010-2013 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

--- 388 unchanged lines hidden (view full) ---

397{
398 Fault fault;
399 const int asid = 0;
400 const ThreadID tid = 0;
401 const Addr pc = thread->instAddr();
402 unsigned block_size = cacheLineSize();
403 BaseTLB::Mode mode = BaseTLB::Read;
404
405 if (traceData) {
406 traceData->setAddr(addr);
407 }
405 if (traceData)
406 traceData->setMem(addr, size, flags);
408
409 RequestPtr req = new Request(asid, addr, size,
410 flags, dataMasterId(), pc, _cpuId, tid);
411
412 req->taskId(taskId());
413
414 Addr split_addr = roundDown(addr + size - 1, block_size);
415 assert(split_addr <= addr || split_addr - addr < block_size);

--- 58 unchanged lines hidden (view full) ---

474 if (data == NULL) {
475 assert(flags & Request::CACHE_BLOCK_ZERO);
476 // This must be a cache block cleaning request
477 memset(newData, 0, size);
478 } else {
479 memcpy(newData, data, size);
480 }
481
407
408 RequestPtr req = new Request(asid, addr, size,
409 flags, dataMasterId(), pc, _cpuId, tid);
410
411 req->taskId(taskId());
412
413 Addr split_addr = roundDown(addr + size - 1, block_size);
414 assert(split_addr <= addr || split_addr - addr < block_size);

--- 58 unchanged lines hidden (view full) ---

473 if (data == NULL) {
474 assert(flags & Request::CACHE_BLOCK_ZERO);
475 // This must be a cache block cleaning request
476 memset(newData, 0, size);
477 } else {
478 memcpy(newData, data, size);
479 }
480
482 if (traceData) {
483 traceData->setAddr(addr);
484 }
481 if (traceData)
482 traceData->setMem(addr, size, flags);
485
486 RequestPtr req = new Request(asid, addr, size,
487 flags, dataMasterId(), pc, _cpuId, tid);
488
489 req->taskId(taskId());
490
491 Addr split_addr = roundDown(addr + size - 1, block_size);
492 assert(split_addr <= addr || split_addr - addr < block_size);

--- 458 unchanged lines hidden --- 		483
484 RequestPtr req = new Request(asid, addr, size,
485 flags, dataMasterId(), pc, _cpuId, tid);
486
487 req->taskId(taskId());
488
489 Addr split_addr = roundDown(addr + size - 1, block_size);
490 assert(split_addr <= addr || split_addr - addr < block_size);

--- 458 unchanged lines hidden ---