claunia/VARCem
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some warnings about too large leftshifts

Browse Source
This commit is contained in:
darkstar
2018-03-24 23:25:45 +01:00
parent 32d589a232
commit f84ee00c16
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/nvr_at.c
View File

@@ -388,7 +388,8 @@ timer_update(void *priv)
/* Update registers with current time. */
time_set(nvr->regs, &tm);
/* Clear update status. */
nvr->upd_stat = 0x00;
@@ -430,7 +431,7 @@ timer_recalc(nvr_t *nvr, int add)
{
int64_t c, nt;
c = 1ULL << ((nvr->regs[RTC_REGA] & REGA_RS) - 1);
nt = (int64_t)(RTCCONST * c * (1<<TIMER_SHIFT));
if (add)
nvr->rtctime += nt;
@@ -679,7 +680,7 @@ const device_t amstrad_nvr_device = {
NULL, NULL, NULL,
NULL
};
};
#if 0
void
nvr_at_init(int irq)
{
@@ -726,4 +727,4 @@ nvr_at_close(void)
nvrp = NULL;
}
}
#endif

12
src/pci.c
View File

@@ -355,7 +355,7 @@ void pci_set_mirq(uint8_t mirq)
pci_mirq_log("pci_set_mirq(%02X): Using IRQ %i\n", mirq, irq_line);
}
if (pci_irq_is_level(irq_line) && (pci_irq_hold[irq_line] & (1 << (0x1E + mirq))))
if (pci_irq_is_level(irq_line) && (pci_irq_hold[irq_line] & (1ULL << (0x1E + mirq))))
{
/* IRQ already held, do nothing. */
pci_mirq_log("pci_set_mirq(%02X): MIRQ is already holding the IRQ\n", mirq);
@@ -384,7 +384,7 @@ void pci_set_mirq(uint8_t mirq)
if (level)
{
pci_mirq_log("pci_set_mirq(%02X): Marking that this card is holding the IRQ\n", mirq);
pci_irq_hold[irq_line] |= (1 << (0x1E + mirq));
pci_irq_hold[irq_line] |= (1ULL << (0x1E + mirq));
}
else
{
@@ -444,7 +444,7 @@ void pci_set_irq(uint8_t card, uint8_t pci_int)
pcilog("pci_set_irq(%02X, %02X): Using IRQ %i\n", card, pci_int, irq_line);
}
if (pci_irq_is_level(irq_line) && (pci_irq_hold[irq_line] & (1 << card)))
if (pci_irq_is_level(irq_line) && (pci_irq_hold[irq_line] & (1ULL << card)))
{
/* IRQ already held, do nothing. */
pcilog("pci_set_irq(%02X, %02X): Card is already holding the IRQ\n", card, pci_int);
@@ -473,7 +473,7 @@ void pci_set_irq(uint8_t card, uint8_t pci_int)
if (pci_irq_is_level(irq_line))
{
pcilog("pci_set_irq(%02X, %02X): Marking that this card is holding the IRQ\n", card, pci_int);
pci_irq_hold[irq_line] |= (1 << card);
pci_irq_hold[irq_line] |= (1ULL << card);
}
else
{
@@ -511,7 +511,7 @@ void pci_clear_mirq(uint8_t mirq)
pci_mirq_log("pci_clear_mirq(%02X): Using IRQ %i\n", mirq, irq_line);
}
if (pci_irq_is_level(irq_line) && !(pci_irq_hold[irq_line] & (1 << (0x1E + mirq))))
if (pci_irq_is_level(irq_line) && !(pci_irq_hold[irq_line] & (1ULL << (0x1E + mirq))))
{
/* IRQ not held, do nothing. */
pci_mirq_log("pci_clear_mirq(%02X): MIRQ is not holding the IRQ\n", mirq);
@@ -594,7 +594,7 @@ void pci_clear_irq(uint8_t card, uint8_t pci_int)
pcilog("pci_clear_irq(%02X, %02X): Using IRQ %i\n", card, pci_int, irq_line);
}
if (pci_irq_is_level(irq_line) && !(pci_irq_hold[irq_line] & (1 << card)))
if (pci_irq_is_level(irq_line) && !(pci_irq_hold[irq_line] & (1ULL << card)))
{
/* IRQ not held, do nothing. */
pcilog("pci_clear_irq(%02X, %02X): Card is not holding the IRQ\n", card, pci_int);

2
src/video/vid_voodoo.c
View File

@@ -2915,7 +2915,7 @@ static void voodoo_half_triangle(voodoo_t *voodoo, voodoo_params_t *params, vood
state->w += (params->dWdX * dx);
if (voodoo_output)
voodoo_log("%08llx %lli %lli\n", state->tmu0_t, state->tmu0_t >> (18+state->lod), (state->tmu0_t + (1 << (17+state->lod))) >> (18+state->lod));
voodoo_log("%08llx %lli %lli\n", state->tmu0_t, state->tmu0_t >> (18+state->lod), (state->tmu0_t + (1ULL << (17+state->lod))) >> (18+state->lod));
if (params->fbzMode & 1)
{