From a8e6adb0b1284e89a63bcb14fe1fdace2b89e0c8 Mon Sep 17 00:00:00 2001 From: Andreas Hansson Date: Tue, 3 Apr 2012 03:50:14 -0400 Subject: Atomic: Remove the physmem_port and access memory directly This patch removes the physmem_port from the Atomic CPU and instead uses the system pointer to access the physmem when using the fastmem option. The system already keeps track of the physmem and the valid memory address ranges, and with this patch we merely make use of that existing functionality. As a result of this change, the overloaded getMasterPort in the Atomic CPU can be removed, thus unifying the CPUs. --- configs/example/fs.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'configs/example/fs.py') diff --git a/configs/example/fs.py b/configs/example/fs.py index 4b6956b72..38571fec3 100644 --- a/configs/example/fs.py +++ b/configs/example/fs.py @@ -1,4 +1,4 @@ -# Copyright (c) 2010-2011 ARM Limited +# Copyright (c) 2010-2012 ARM Limited # All rights reserved. # # The license below extends only to copyright in the software and shall @@ -133,9 +133,13 @@ else: test_sys.iobridge.slave = test_sys.iobus.master test_sys.iobridge.master = test_sys.membus.slave +# Sanity check +if options.fastmem and (options.caches or options.l2cache): + fatal("You cannot use fastmem in combination with caches!") + for i in xrange(np): if options.fastmem: - test_sys.cpu[i].physmem_port = test_sys.physmem.port + test_sys.cpu[i].fastmem = True if options.checker: test_sys.cpu[i].addCheckerCpu() @@ -160,7 +164,7 @@ if len(bm) == 2: drive_sys.cpu.createInterruptController() drive_sys.cpu.connectAllPorts(drive_sys.membus) if options.fastmem: - drive_sys.cpu.physmem_port = drive_sys.physmem.port + drive_sys.cpu.fastmem = True if options.kernel is not None: drive_sys.kernel = binary(options.kernel) drive_sys.iobridge = Bridge(delay='50ns', nack_delay='4ns', -- cgit v1.2.3