Commit f610349f36a78231a843ab57499b23ed9ea5ce1e
1 parent
05ee37eb
Fix collision in PowerPC instructions definitions.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3668 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
11 additions
and
11 deletions
target-ppc/translate.c
| @@ -441,29 +441,29 @@ enum { | @@ -441,29 +441,29 @@ enum { | ||
| 441 | #define PPC_MISC PPC_INSNS_BASE | 441 | #define PPC_MISC PPC_INSNS_BASE |
| 442 | /* Deprecated instruction sets */ | 442 | /* Deprecated instruction sets */ |
| 443 | /* Original POWER instruction set */ | 443 | /* Original POWER instruction set */ |
| 444 | - PPC_POWER = 0x0000000000000001ULL, | 444 | + PPC_POWER = 0x0000000000000002ULL, |
| 445 | /* POWER2 instruction set extension */ | 445 | /* POWER2 instruction set extension */ |
| 446 | - PPC_POWER2 = 0x0000000000000002ULL, | 446 | + PPC_POWER2 = 0x0000000000000004ULL, |
| 447 | /* Power RTC support */ | 447 | /* Power RTC support */ |
| 448 | - PPC_POWER_RTC = 0x0000000000000004ULL, | 448 | + PPC_POWER_RTC = 0x0000000000000008ULL, |
| 449 | /* Power-to-PowerPC bridge (601) */ | 449 | /* Power-to-PowerPC bridge (601) */ |
| 450 | - PPC_POWER_BR = 0x0000000000000008ULL, | 450 | + PPC_POWER_BR = 0x0000000000000010ULL, |
| 451 | /* 64 bits PowerPC instruction set */ | 451 | /* 64 bits PowerPC instruction set */ |
| 452 | - PPC_64B = 0x0000000000000010ULL, | 452 | + PPC_64B = 0x0000000000000020ULL, |
| 453 | /* New 64 bits extensions (PowerPC 2.0x) */ | 453 | /* New 64 bits extensions (PowerPC 2.0x) */ |
| 454 | - PPC_64BX = 0x0000000000000020ULL, | 454 | + PPC_64BX = 0x0000000000000040ULL, |
| 455 | /* 64 bits hypervisor extensions */ | 455 | /* 64 bits hypervisor extensions */ |
| 456 | - PPC_64H = 0x0000000000000040ULL, | 456 | + PPC_64H = 0x0000000000000080ULL, |
| 457 | /* New wait instruction (PowerPC 2.0x) */ | 457 | /* New wait instruction (PowerPC 2.0x) */ |
| 458 | - PPC_WAIT = 0x0000000000000080ULL, | 458 | + PPC_WAIT = 0x0000000000000100ULL, |
| 459 | /* Time base mftb instruction */ | 459 | /* Time base mftb instruction */ |
| 460 | - PPC_MFTB = 0x0000000000000100ULL, | 460 | + PPC_MFTB = 0x0000000000000200ULL, |
| 461 | 461 | ||
| 462 | /* Fixed-point unit extensions */ | 462 | /* Fixed-point unit extensions */ |
| 463 | /* PowerPC 602 specific */ | 463 | /* PowerPC 602 specific */ |
| 464 | - PPC_602_SPEC = 0x0000000000000200ULL, | 464 | + PPC_602_SPEC = 0x0000000000000400ULL, |
| 465 | /* PowerPC 2.03 specification extensions */ | 465 | /* PowerPC 2.03 specification extensions */ |
| 466 | - PPC_203 = 0x0000000000000400ULL, | 466 | + PPC_203 = 0x0000000000000800ULL, |
| 467 | 467 | ||
| 468 | /* Floating-point unit extensions */ | 468 | /* Floating-point unit extensions */ |
| 469 | /* Optional floating point instructions */ | 469 | /* Optional floating point instructions */ |