Commit 612b477d48c9c71669d686da9897afc603c71877
1 parent
6c9bf893
removed warnings
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@577 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
12 additions
and
7 deletions
target-sparc/op.c
| @@ -120,7 +120,6 @@ | @@ -120,7 +120,6 @@ | ||
| 120 | #define EIP (env->pc) | 120 | #define EIP (env->pc) |
| 121 | 121 | ||
| 122 | #define FLAG_SET(x) (env->psr&x)?1:0 | 122 | #define FLAG_SET(x) (env->psr&x)?1:0 |
| 123 | -#define GET_FLAGS unsigned int Z = FLAG_SET(PSR_ZERO), N = FLAG_SET(PSR_NEG), V = FLAG_SET(PSR_OVF), C = FLAG_SET(PSR_CARRY) | ||
| 124 | 123 | ||
| 125 | void OPPROTO op_movl_T0_0(void) | 124 | void OPPROTO op_movl_T0_0(void) |
| 126 | { | 125 | { |
| @@ -538,19 +537,22 @@ void OPPROTO op_eval_be(void) | @@ -538,19 +537,22 @@ void OPPROTO op_eval_be(void) | ||
| 538 | 537 | ||
| 539 | void OPPROTO op_eval_ble(void) | 538 | void OPPROTO op_eval_ble(void) |
| 540 | { | 539 | { |
| 541 | - GET_FLAGS; | 540 | + unsigned int Z = FLAG_SET(PSR_ZERO), N = FLAG_SET(PSR_NEG), V = FLAG_SET(PSR_OVF); |
| 541 | + | ||
| 542 | T2 = Z | (N ^ V); | 542 | T2 = Z | (N ^ V); |
| 543 | } | 543 | } |
| 544 | 544 | ||
| 545 | void OPPROTO op_eval_bl(void) | 545 | void OPPROTO op_eval_bl(void) |
| 546 | { | 546 | { |
| 547 | - GET_FLAGS; | 547 | + unsigned int N = FLAG_SET(PSR_NEG), V = FLAG_SET(PSR_OVF); |
| 548 | + | ||
| 548 | T2 = N ^ V; | 549 | T2 = N ^ V; |
| 549 | } | 550 | } |
| 550 | 551 | ||
| 551 | void OPPROTO op_eval_bleu(void) | 552 | void OPPROTO op_eval_bleu(void) |
| 552 | { | 553 | { |
| 553 | - GET_FLAGS; | 554 | + unsigned int Z = FLAG_SET(PSR_ZERO), C = FLAG_SET(PSR_CARRY); |
| 555 | + | ||
| 554 | T2 = C | Z; | 556 | T2 = C | Z; |
| 555 | } | 557 | } |
| 556 | 558 | ||
| @@ -576,19 +578,22 @@ void OPPROTO op_eval_bne(void) | @@ -576,19 +578,22 @@ void OPPROTO op_eval_bne(void) | ||
| 576 | 578 | ||
| 577 | void OPPROTO op_eval_bg(void) | 579 | void OPPROTO op_eval_bg(void) |
| 578 | { | 580 | { |
| 579 | - GET_FLAGS; | 581 | + unsigned int Z = FLAG_SET(PSR_ZERO), N = FLAG_SET(PSR_NEG), V = FLAG_SET(PSR_OVF); |
| 582 | + | ||
| 580 | T2 = !(Z | (N ^ V)); | 583 | T2 = !(Z | (N ^ V)); |
| 581 | } | 584 | } |
| 582 | 585 | ||
| 583 | void OPPROTO op_eval_bge(void) | 586 | void OPPROTO op_eval_bge(void) |
| 584 | { | 587 | { |
| 585 | - GET_FLAGS; | 588 | + unsigned int N = FLAG_SET(PSR_NEG), V = FLAG_SET(PSR_OVF); |
| 589 | + | ||
| 586 | T2 = !(N ^ V); | 590 | T2 = !(N ^ V); |
| 587 | } | 591 | } |
| 588 | 592 | ||
| 589 | void OPPROTO op_eval_bgu(void) | 593 | void OPPROTO op_eval_bgu(void) |
| 590 | { | 594 | { |
| 591 | - GET_FLAGS; | 595 | + unsigned int Z = FLAG_SET(PSR_ZERO), C = FLAG_SET(PSR_CARRY); |
| 596 | + | ||
| 592 | T2 = !(C | Z); | 597 | T2 = !(C | Z); |
| 593 | } | 598 | } |
| 594 | 599 |