1c1,14
< /* Copyright (c) 2007-2008 The Florida State University
---
> /*
> * Copyright (c) 2010 ARM Limited
> * All rights reserved
> *
> * The license below extends only to copyright in the software and shall
> * not be construed as granting a license to any other intellectual
> * property including but not limited to intellectual property relating
> * to a hardware implementation of the functionality of the software
> * licensed hereunder. You may use the software subject to the license
> * terms below provided that you ensure that this notice is replicated
> * unmodified and in its entirety in all distributions of the software,
> * modified or unmodified, in source code or in binary form.
> *
> * Copyright (c) 2007-2008 The Florida State University
126a140,147
>
> template<class XC>
> static void
> setNextPC(XC *xc, Addr val)
> {
> xc->setNextPC((xc->readNextPC() & PcModeMask) |
> (val & ~PcModeMask));
> }