Revision 9a7f3228

b/tcg/sparc/tcg-target.c
198 198

  
199 199
#define ARITH_ADD  (INSN_OP(2) | INSN_OP3(0x00))
200 200
#define ARITH_AND  (INSN_OP(2) | INSN_OP3(0x01))
201
#define ARITH_ANDCC (INSN_OP(2) | INSN_OP3(0x11))
202 201
#define ARITH_OR   (INSN_OP(2) | INSN_OP3(0x02))
202
#define ARITH_ORCC (INSN_OP(2) | INSN_OP3(0x12))
203 203
#define ARITH_XOR  (INSN_OP(2) | INSN_OP3(0x03))
204 204
#define ARITH_SUB  (INSN_OP(2) | INSN_OP3(0x04))
205 205
#define ARITH_SUBCC (INSN_OP(2) | INSN_OP3(0x14))
......
387 387
                           int label_index)
388 388
{
389 389
    if (const_arg2 && arg2 == 0)
390
        /* andcc r, r, %g0 */
391
        tcg_out_arith(s, TCG_REG_G0, arg1, arg1, ARITH_ANDCC);
390
        /* orcc r, r, %g0 */
391
        tcg_out_arith(s, TCG_REG_G0, TCG_REG_G0, arg1, ARITH_ORCC);
392 392
    else
393 393
        /* subcc r1, r2, %g0 */
394 394
        tcg_out_arith(s, TCG_REG_G0, arg1, arg2, ARITH_SUBCC);
......
418 418
extern void __stq_mmu(void);
419 419

  
420 420

  
421
static void *qemu_ld_helpers[4] = {
421
static const void * const qemu_ld_helpers[4] = {
422 422
    __ldb_mmu,
423 423
    __ldw_mmu,
424 424
    __ldl_mmu,
425 425
    __ldq_mmu,
426 426
};
427 427

  
428
static void *qemu_st_helpers[4] = {
428
static const void * const qemu_st_helpers[4] = {
429 429
    __stb_mmu,
430 430
    __stw_mmu,
431 431
    __stl_mmu,
......
531 531
    tcg_out32(s, 0);
532 532

  
533 533
    /* label1: */
534
    *label1_ptr = (INSN_OP(0) | COND_A | INSN_OP2(0x2) |
534
    *label1_ptr = (INSN_OP(0) | INSN_COND(COND_A, 0) | INSN_OP2(0x2) |
535 535
                   INSN_OFF22((unsigned long)label1_ptr -
536 536
                              (unsigned long)s->code_ptr));
537 537

  
......
599 599

  
600 600
#if defined(CONFIG_SOFTMMU)
601 601
    /* label2: */
602
    *label2_ptr = (INSN_OP(0) | COND_A | INSN_OP2(0x2) |
602
    *label2_ptr = (INSN_OP(0) | INSN_COND(COND_A, 0) | INSN_OP2(0x2) |
603 603
                   INSN_OFF22((unsigned long)label2_ptr -
604 604
                              (unsigned long)s->code_ptr));
605 605
#endif
......
703 703
    tcg_out32(s, 0);
704 704

  
705 705
    /* label1: */
706
    *label1_ptr = (INSN_OP(0) | COND_A | INSN_OP2(0x2) |
706
    *label1_ptr = (INSN_OP(0) | INSN_COND(COND_A, 0) | INSN_OP2(0x2) |
707 707
                   INSN_OFF22((unsigned long)label1_ptr -
708 708
                              (unsigned long)s->code_ptr));
709 709

  
......
753 753

  
754 754
#if defined(CONFIG_SOFTMMU)
755 755
    /* label2: */
756
    *label2_ptr = (INSN_OP(0) | COND_A | INSN_OP2(0x2) |
756
    *label2_ptr = (INSN_OP(0) | INSN_COND(COND_A, 0) | INSN_OP2(0x2) |
757 757
                   INSN_OFF22((unsigned long)label2_ptr -
758 758
                              (unsigned long)s->code_ptr));
759 759
#endif

Also available in: Unified diff