Revision 0fa85d43 target-arm/translate.c

b/target-arm/translate.c
29 29

  
30 30
/* internal defines */
31 31
typedef struct DisasContext {
32
    uint8_t *pc;
32
    target_ulong pc;
33 33
    int is_jmp;
34 34
    struct TranslationBlock *tb;
35 35
} DisasContext;
......
762 762
    DisasContext dc1, *dc = &dc1;
763 763
    uint16_t *gen_opc_end;
764 764
    int j, lj;
765
    uint8_t *pc_start;
765
    target_ulong pc_start;
766 766
    
767 767
    /* generate intermediate code */
768
    pc_start = (uint8_t *)tb->pc;
768
    pc_start = tb->pc;
769 769
       
770 770
    dc->tb = tb;
771 771

  
......
784 784
                while (lj < j)
785 785
                    gen_opc_instr_start[lj++] = 0;
786 786
            }
787
            gen_opc_pc[lj] = (uint32_t)dc->pc;
787
            gen_opc_pc[lj] = dc->pc;
788 788
            gen_opc_instr_start[lj] = 1;
789 789
        }
790 790
        disas_arm_insn(dc);
......
811 811
    if (loglevel & CPU_LOG_TB_IN_ASM) {
812 812
        fprintf(logfile, "----------------\n");
813 813
        fprintf(logfile, "IN: %s\n", lookup_symbol(pc_start));
814
        disas(logfile, pc_start, dc->pc - pc_start, 0, 0);
814
        target_disas(logfile, pc_start, dc->pc - pc_start, 0);
815 815
        fprintf(logfile, "\n");
816 816
        if (loglevel & (CPU_LOG_TB_OP)) {
817 817
            fprintf(logfile, "OP:\n");

Also available in: Unified diff