system.cc (12122:20512f6810d7) system.cc (12262:a58c0c323e4f)
1/*
2 * Copyright (c) 2011-2014 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

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

169 fatal("could not load kernel symbols\n");
170
171 if (!kernel->loadLocalSymbols(debugSymbolTable))
172 fatal("could not load kernel local symbols\n");
173
174 // Loading only needs to happen once and after memory system is
175 // connected so it will happen in initState()
176 }
1/*
2 * Copyright (c) 2011-2014 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

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

169 fatal("could not load kernel symbols\n");
170
171 if (!kernel->loadLocalSymbols(debugSymbolTable))
172 fatal("could not load kernel local symbols\n");
173
174 // Loading only needs to happen once and after memory system is
175 // connected so it will happen in initState()
176 }
177
178 for (const auto &obj_name : p->kernel_extras) {
179 inform("Loading additional kernel object: %s", obj_name);
180 ObjectFile *obj = createObjectFile(obj_name);
181 fatal_if(!obj, "Failed to additional kernel object '%s'.\n",
182 obj_name);
183 kernelExtras.push_back(obj);
184 }
177 }
178
179 // increment the number of running systems
180 numSystemsRunning++;
181
182 // Set back pointers to the system in all memories
183 for (int x = 0; x < params()->memories.size(); x++)
184 params()->memories[x]->system(this);

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

307 kernelStart,
308 kernelEnd, (kernelStart & loadAddrMask) +
309 loadAddrOffset,
310 (kernelEnd & loadAddrMask) + loadAddrOffset);
311 }
312 }
313 // Load program sections into memory
314 kernel->loadSections(physProxy, loadAddrMask, loadAddrOffset);
185 }
186
187 // increment the number of running systems
188 numSystemsRunning++;
189
190 // Set back pointers to the system in all memories
191 for (int x = 0; x < params()->memories.size(); x++)
192 params()->memories[x]->system(this);

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

315 kernelStart,
316 kernelEnd, (kernelStart & loadAddrMask) +
317 loadAddrOffset,
318 (kernelEnd & loadAddrMask) + loadAddrOffset);
319 }
320 }
321 // Load program sections into memory
322 kernel->loadSections(physProxy, loadAddrMask, loadAddrOffset);
323 for (const auto &extra_kernel : kernelExtras) {
324 extra_kernel->loadSections(physProxy, loadAddrMask,
325 loadAddrOffset);
326 }
315
316 DPRINTF(Loader, "Kernel start = %#x\n", kernelStart);
317 DPRINTF(Loader, "Kernel end = %#x\n", kernelEnd);
318 DPRINTF(Loader, "Kernel entry = %#x\n", kernelEntry);
319 DPRINTF(Loader, "Kernel loaded...\n");
320 }
321 }
322}

--- 197 unchanged lines hidden --- 		327
328 DPRINTF(Loader, "Kernel start = %#x\n", kernelStart);
329 DPRINTF(Loader, "Kernel end = %#x\n", kernelEnd);
330 DPRINTF(Loader, "Kernel entry = %#x\n", kernelEntry);
331 DPRINTF(Loader, "Kernel loaded...\n");
332 }
333 }
334}

--- 197 unchanged lines hidden ---