1549 |
|
start_brace(); |
1550 |
|
comprintf("\tint newad=scratchie++;\n" |
1551 |
|
"\treadlong(15,newad,scratchie);\n" |
1552 |
< |
"\tmov_l_mr((uae_u32)®s.pc,newad);\n" |
1552 |
> |
"\tmov_l_mr((uintptr)®s.pc,newad);\n" |
1553 |
|
"\tget_n_addr_jmp(newad,PC_P,scratchie);\n" |
1554 |
< |
"\tmov_l_mr((uae_u32)®s.pc_oldp,PC_P);\n" |
1554 |
> |
"\tmov_l_mr((uintptr)®s.pc_oldp,PC_P);\n" |
1555 |
|
"\tm68k_pc_offset=0;\n" |
1556 |
|
"\tadd_l(15,offs);\n"); |
1557 |
|
gen_update_next_handler(); |
1580 |
|
case i_RTS: |
1581 |
|
comprintf("\tint newad=scratchie++;\n" |
1582 |
|
"\treadlong(15,newad,scratchie);\n" |
1583 |
< |
"\tmov_l_mr((uae_u32)®s.pc,newad);\n" |
1583 |
> |
"\tmov_l_mr((uintptr)®s.pc,newad);\n" |
1584 |
|
"\tget_n_addr_jmp(newad,PC_P,scratchie);\n" |
1585 |
< |
"\tmov_l_mr((uae_u32)®s.pc_oldp,PC_P);\n" |
1585 |
> |
"\tmov_l_mr((uintptr)®s.pc_oldp,PC_P);\n" |
1586 |
|
"\tm68k_pc_offset=0;\n" |
1587 |
|
"\tlea_l_brr(15,15,4);\n"); |
1588 |
|
gen_update_next_handler(); |
1605 |
|
"\tmov_l_ri(ret,retadd);\n" |
1606 |
|
"\tsub_l_ri(15,4);\n" |
1607 |
|
"\twritelong_clobber(15,ret,scratchie);\n"); |
1608 |
< |
comprintf("\tmov_l_mr((uae_u32)®s.pc,srca);\n" |
1608 |
> |
comprintf("\tmov_l_mr((uintptr)®s.pc,srca);\n" |
1609 |
|
"\tget_n_addr_jmp(srca,PC_P,scratchie);\n" |
1610 |
< |
"\tmov_l_mr((uae_u32)®s.pc_oldp,PC_P);\n" |
1610 |
> |
"\tmov_l_mr((uintptr)®s.pc_oldp,PC_P);\n" |
1611 |
|
"\tm68k_pc_offset=0;\n"); |
1612 |
|
gen_update_next_handler(); |
1613 |
|
break; |
1614 |
|
case i_JMP: |
1615 |
|
isjump; |
1616 |
|
genamode (curi->smode, "srcreg", curi->size, "src", 0, 0); |
1617 |
< |
comprintf("\tmov_l_mr((uae_u32)®s.pc,srca);\n" |
1617 |
> |
comprintf("\tmov_l_mr((uintptr)®s.pc,srca);\n" |
1618 |
|
"\tget_n_addr_jmp(srca,PC_P,scratchie);\n" |
1619 |
< |
"\tmov_l_mr((uae_u32)®s.pc_oldp,PC_P);\n" |
1619 |
> |
"\tmov_l_mr((uintptr)®s.pc_oldp,PC_P);\n" |
1620 |
|
"\tm68k_pc_offset=0;\n"); |
1621 |
|
gen_update_next_handler(); |
1622 |
|
break; |
1647 |
|
comprintf("\tsub_l_ri(src,m68k_pc_offset-m68k_pc_offset_thisinst-2);\n"); |
1648 |
|
/* Leave the following as "add" --- it will allow it to be optimized |
1649 |
|
away due to src being a constant ;-) */ |
1650 |
< |
comprintf("\tadd_l_ri(src,(uae_u32)comp_pc_p);\n"); |
1651 |
< |
comprintf("\tmov_l_ri(PC_P,(uae_u32)comp_pc_p);\n"); |
1650 |
> |
comprintf("\tadd_l_ri(src,(uintptr)comp_pc_p);\n"); |
1651 |
> |
comprintf("\tmov_l_ri(PC_P,(uintptr)comp_pc_p);\n"); |
1652 |
|
/* Now they are both constant. Might as well fold in m68k_pc_offset */ |
1653 |
|
comprintf("\tadd_l_ri(src,m68k_pc_offset);\n"); |
1654 |
|
comprintf("\tadd_l_ri(PC_P,m68k_pc_offset);\n"); |
1721 |
|
default: abort(); /* Seems this only comes in word flavour */ |
1722 |
|
} |
1723 |
|
comprintf("\tsub_l_ri(offs,m68k_pc_offset-m68k_pc_offset_thisinst-2);\n"); |
1724 |
< |
comprintf("\tadd_l_ri(offs,(uae_u32)comp_pc_p);\n"); /* New PC, |
1724 |
> |
comprintf("\tadd_l_ri(offs,(uintptr)comp_pc_p);\n"); /* New PC, |
1725 |
|
once the |
1726 |
|
offset_68k is |
1727 |
|
* also added */ |