system.cc (9053:9cad1c26c3b3) system.cc (9142:e9b713df4e1d)
1/*
2 * Copyright (c) 2011-2012 ARM Limited
3 * All rights reserved
4 *
5 * The license below extends only to copyright in the software and shall
6 * not be construed as granting a license to any other intellectual
7 * property including but not limited to intellectual property relating
8 * to a hardware implementation of the functionality of the software

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

46 */
47
48#include "arch/isa_traits.hh"
49#include "arch/remote_gdb.hh"
50#include "arch/utility.hh"
51#include "arch/vtophys.hh"
52#include "base/loader/object_file.hh"
53#include "base/loader/symtab.hh"
1/*
2 * Copyright (c) 2011-2012 ARM Limited
3 * All rights reserved
4 *
5 * The license below extends only to copyright in the software and shall
6 * not be construed as granting a license to any other intellectual
7 * property including but not limited to intellectual property relating
8 * to a hardware implementation of the functionality of the software

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

46 */
47
48#include "arch/isa_traits.hh"
49#include "arch/remote_gdb.hh"
50#include "arch/utility.hh"
51#include "arch/vtophys.hh"
52#include "base/loader/object_file.hh"
53#include "base/loader/symtab.hh"
54#include "base/str.hh"
54#include "base/trace.hh"
55#include "config/the_isa.hh"
56#include "cpu/thread_context.hh"
57#include "debug/Loader.hh"
58#include "debug/WorkItems.hh"
59#include "kern/kernel_stats.hh"
60#include "mem/physical.hh"
61#include "params/System.hh"

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

397{
398 System::printSystems();
399}
400
401MasterID
402System::getMasterId(std::string master_name)
403{
404 // strip off system name if the string starts with it
55#include "base/trace.hh"
56#include "config/the_isa.hh"
57#include "cpu/thread_context.hh"
58#include "debug/Loader.hh"
59#include "debug/WorkItems.hh"
60#include "kern/kernel_stats.hh"
61#include "mem/physical.hh"
62#include "params/System.hh"

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

398{
399 System::printSystems();
400}
401
402MasterID
403System::getMasterId(std::string master_name)
404{
405 // strip off system name if the string starts with it
405 if (master_name.size() > name().size() &&
406 master_name.compare(0, name().size(), name()) == 0)
406 if (startswith(master_name, name()))
407 master_name = master_name.erase(0, name().size() + 1);
408
409 // CPUs in switch_cpus ask for ids again after switching
410 for (int i = 0; i < masterIds.size(); i++) {
411 if (masterIds[i] == master_name) {
412 return i;
413 }
414 }

--- 31 unchanged lines hidden --- 		407 master_name = master_name.erase(0, name().size() + 1);
408
409 // CPUs in switch_cpus ask for ids again after switching
410 for (int i = 0; i < masterIds.size(); i++) {
411 if (masterIds[i] == master_name) {
412 return i;
413 }
414 }

--- 31 unchanged lines hidden ---