| data64.isa (12508:78b44de943ea) | data64.isa (13363:15eae7ca2bfd) |
|---|---|
| 1// -*- mode:c++ -*- 2 3// Copyright (c) 2011-2013, 2016-2018 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 --- 321 unchanged lines hidden (view full) --- 330 if (el <= EL1 && msrMrs64TrapToSup(flat_idx, el, Cpacr64)) 331 return std::make_shared<SupervisorTrap>(machInst, 0x1E00000, 332 EC_TRAPPED_SIMD_FP); 333 334 bool is_vfp_neon = false; 335 336 // Check for traps to hypervisor 337 if ((ArmSystem::haveVirtualization(xc->tcBase()) && el <= EL2) && | 1// -*- mode:c++ -*- 2 3// Copyright (c) 2011-2013, 2016-2018 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 --- 321 unchanged lines hidden (view full) --- 330 if (el <= EL1 && msrMrs64TrapToSup(flat_idx, el, Cpacr64)) 331 return std::make_shared<SupervisorTrap>(machInst, 0x1E00000, 332 EC_TRAPPED_SIMD_FP); 333 334 bool is_vfp_neon = false; 335 336 // Check for traps to hypervisor 337 if ((ArmSystem::haveVirtualization(xc->tcBase()) && el <= EL2) && |
| 338 msrMrs64TrapToHyp(flat_idx, el, %s, CptrEl264, Hcr64, &is_vfp_neon)) { | 338 msrMrs64TrapToHyp(flat_idx, el, %s, CptrEl264, Hcr64, 339 Scr64, cpsr, &is_vfp_neon)) { 340 |
| 339 return std::make_shared<HypervisorTrap>( 340 machInst, is_vfp_neon ? 0x1E00000 : imm, 341 is_vfp_neon ? EC_TRAPPED_SIMD_FP : EC_TRAPPED_MSR_MRS_64); 342 } 343 344 // Check for traps to secure monitor 345 if ((ArmSystem::haveSecurity(xc->tcBase()) && el <= EL3) && 346 msrMrs64TrapToMon(flat_idx, CptrEl364, el, &is_vfp_neon)) { --- 275 unchanged lines hidden --- | 341 return std::make_shared<HypervisorTrap>( 342 machInst, is_vfp_neon ? 0x1E00000 : imm, 343 is_vfp_neon ? EC_TRAPPED_SIMD_FP : EC_TRAPPED_MSR_MRS_64); 344 } 345 346 // Check for traps to secure monitor 347 if ((ArmSystem::haveSecurity(xc->tcBase()) && el <= EL3) && 348 msrMrs64TrapToMon(flat_idx, CptrEl364, el, &is_vfp_neon)) { --- 275 unchanged lines hidden --- |