cpt_upgrader.py (10338:8bee5f4edb92) cpt_upgrader.py (10861:9141d87c7f71)
1#!/usr/bin/env python
2
3# Copyright (c) 2012-2013 ARM Limited
4# All rights reserved
5#
6# The license below extends only to copyright in the software and shall
7# not be construed as granting a license to any other intellectual
8# property including but not limited to intellectual property relating

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

597 ccRegs = intRegs[38:43]
598 del intRegs[38:43]
599
600 ccRegs.append('0') # CCREG_ZERO
601
602 cpt.set(sec, 'intRegs', ' '.join(intRegs))
603 cpt.set(sec, 'ccRegs', ' '.join(ccRegs))
604
1#!/usr/bin/env python
2
3# Copyright (c) 2012-2013 ARM Limited
4# All rights reserved
5#
6# The license below extends only to copyright in the software and shall
7# not be construed as granting a license to any other intellectual
8# property including but not limited to intellectual property relating

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

597 ccRegs = intRegs[38:43]
598 del intRegs[38:43]
599
600 ccRegs.append('0') # CCREG_ZERO
601
602 cpt.set(sec, 'intRegs', ' '.join(intRegs))
603 cpt.set(sec, 'ccRegs', ' '.join(ccRegs))
604
605# Checkpoint version E adds the ARM CONTEXTIDR_EL2 miscreg.
606def from_D(cpt):
607 if cpt.get('root','isa') == 'arm':
608 for sec in cpt.sections():
609 import re
610 # Search for all ISA sections
611 if re.search('.*sys.*\.cpu.*\.isa$', sec):
612 miscRegs = cpt.get(sec, 'miscRegs').split()
613 # CONTEXTIDR_EL2 defaults to 0b11111100000000000001
614 miscRegs[599:599] = [0xFC001]
615 cpt.set(sec, 'miscRegs', ' '.join(str(x) for x in miscRegs))
616
605migrations = []
606migrations.append(from_0)
607migrations.append(from_1)
608migrations.append(from_2)
609migrations.append(from_3)
610migrations.append(from_4)
611migrations.append(from_5)
612migrations.append(from_6)
613migrations.append(from_7)
614migrations.append(from_8)
615migrations.append(from_9)
616migrations.append(from_A)
617migrations.append(from_B)
618migrations.append(from_C)
617migrations = []
618migrations.append(from_0)
619migrations.append(from_1)
620migrations.append(from_2)
621migrations.append(from_3)
622migrations.append(from_4)
623migrations.append(from_5)
624migrations.append(from_6)
625migrations.append(from_7)
626migrations.append(from_8)
627migrations.append(from_9)
628migrations.append(from_A)
629migrations.append(from_B)
630migrations.append(from_C)
631migrations.append(from_D)
619
620verbose_print = False
621
622def verboseprint(*args):
623 if not verbose_print:
624 return
625 for arg in args:
626 print arg,

--- 95 unchanged lines hidden ---
632
633verbose_print = False
634
635def verboseprint(*args):
636 if not verbose_print:
637 return
638 for arg in args:
639 print arg,

--- 95 unchanged lines hidden ---