From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <sid-return-619-listarch-sid=sources.redhat.com@sources.redhat.com>
Received: (qmail 19275 invoked by alias); 26 May 2003 17:16:29 -0000
Mailing-List: contact sid-help@sources.redhat.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:sid-subscribe@sources.redhat.com>
List-Archive: <http://sources.redhat.com/ml/sid/>
List-Post: <mailto:sid@sources.redhat.com>
List-Help: <mailto:sid-help@sources.redhat.com>, <http://sources.redhat.com/lists.html#faqs>
Sender: sid-owner@sources.redhat.com
Received: (qmail 19129 invoked from network); 26 May 2003 17:16:26 -0000
Received: from unknown (HELO touchme.toronto.redhat.com) (207.219.125.105)
  by sources.redhat.com with SMTP; 26 May 2003 17:16:26 -0000
Received: from redhat.com (vpn50-36.rdu.redhat.com [172.16.50.36])
	by touchme.toronto.redhat.com (Postfix) with ESMTP id E58D28000E5
	for <sid@sources.redhat.com>; Mon, 26 May 2003 13:16:24 -0400 (EDT)
Message-ID: <3ED24C34.8040704@redhat.com>
Date: Mon, 26 May 2003 17:16:00 -0000
From: Dave Brolley <brolley@redhat.com>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.0.2) Gecko/20021216
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: sid@sources.redhat.com
Subject: [patch][rfa] Mapping base for BoardCfg::add_memory
Content-Type: multipart/mixed;
 boundary="------------050805090302090004070907"
X-SW-Source: 2003-q2/txt/msg00035.txt.bz2

This is a multi-part message in MIME format.
--------------050805090302090004070907
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Content-length: 352

Hi,

Some architectures have complex memory maps and so I found it necessary 
on the port I'm working with to defer the setting of the base of the 
mapping passed to BoardCfg::add_memory. The base is now explictely set 
to zero where requred, but left unset when passed to add_memory.

Tested on an internal port and on xstormy16.

ok to commit?

Dave

--------------050805090302090004070907
Content-Type: text/plain;
 name="mapbase.patch.txt"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="mapbase.patch.txt"
Content-length: 1627

Index: sid/main/dynamic/commonCfg.cxx
===================================================================
RCS file: /cvs/src/src/sid/main/dynamic/commonCfg.cxx,v
retrieving revision 1.3
diff -c -p -r1.3 commonCfg.cxx
*** sid/main/dynamic/commonCfg.cxx	16 Apr 2003 22:01:07 -0000	1.3
--- sid/main/dynamic/commonCfg.cxx	26 May 2003 16:46:13 -0000
*************** void BoardCfg::add_icache (const string 
*** 1078,1084 ****
  void BoardCfg::add_memory (const Mapping &m)
  {
    if (main_mapper)
!     main_mapper->map (m);
  }
  
  
--- 1102,1111 ----
  void BoardCfg::add_memory (const Mapping &m)
  {
    if (main_mapper)
!     {
!       Mapping map(m);
!       main_mapper->map (map.base(0));
!     }
  }
  
  
Index: sid/main/dynamic/mainDynamic.cxx
===================================================================
RCS file: /cvs/src/src/sid/main/dynamic/mainDynamic.cxx,v
retrieving revision 1.3
diff -c -p -r1.3 mainDynamic.cxx
*** sid/main/dynamic/mainDynamic.cxx	9 Jan 2003 04:22:50 -0000	1.3
--- sid/main/dynamic/mainDynamic.cxx	26 May 2003 16:46:13 -0000
*************** void try_add_memory (const string memspe
*** 381,390 ****
         i != bases.end(); ++i)
      {
        Mapping m = Mapping()
! 	.slave(mem).bus(port).base(0)
  	.low(*i).high((*i) + size - 1);
        if (map)
! 	map->map (m);
        else if (board)
  	board->add_memory (m);
        else
--- 385,394 ----
         i != bases.end(); ++i)
      {
        Mapping m = Mapping()
! 	.slave(mem).bus(port)
  	.low(*i).high((*i) + size - 1);
        if (map)
! 	map->map (m.base(0));
        else if (board)
  	board->add_memory (m);
        else

--------------050805090302090004070907--