Changeset 1912

Timestamp:

04/04/07 10:25:13 (2 years ago)

Author:

vboxsync

Message:

muldiv64() => ASMMultU64ByU32DivByU32(); dma.c => DevDMA.cpp

Files:

• trunk/src/VBox/Devices/Makefile (modified) (4 diffs)
• trunk/src/VBox/Devices/PC/DevACPI.cpp (modified) (3 diffs)
• trunk/src/VBox/Devices/PC/DevDMA.cpp (moved) (moved from trunk/src/VBox/Devices/PC/dma.c) (13 diffs)
• trunk/src/VBox/Devices/PC/DevPit-i8254.cpp (modified) (10 diffs)
• trunk/src/VBox/Devices/PC/DevRTC.cpp (modified) (2 diffs)
• trunk/src/VBox/Devices/PC/Etherboot-src/Makefile.kmk (modified) (2 diffs)
• trunk/src/VBox/Devices/muldiv64.c (deleted)
• trunk/src/VBox/Devices/vl_vbox.h (modified) (1 diff)

trunk/src/VBox/Devices/Makefile

@@ -92 +92 @@
-VBoxDD_SDKS.win         = WINPSDK DXSDK W2K3DDK VBOX_NTDLL
-VBoxDD_SOURCES          = \
-
-
+
-VBoxDD_DEFS             = VBOX_ACPI
-ifdef VBOX_WITH_USB
@@ -181 +180 @@
-        Network/DevPCNet.cpp \
-        Audio/DevIchAc97.cpp \
-dma.c
+DevDMA.cpp
-        Storage/fdc.c \
-        Serial/DevSerial.cpp
@@ -216 +215 @@
-        $(PATH_CURRENT)
-VBoxDDGC_SOURCES        = \
-        muldiv64.c \
-        Bus/DevPCI.cpp \
-        Graphics/DevVGA.cpp \
@@ -253 +251 @@
-        $(PATH_CURRENT)
-VBoxDDR0_SOURCES        = \
-        muldiv64.c \
-        Bus/DevPCI.cpp \
-        Graphics/DevVGA.cpp \

trunk/src/VBox/Devices/PC/DevACPI.cpp

@@ -26 +26 @@
-#include <VBox/log.h>
-#include <iprt/assert.h>
+#include <iprt/asm.h>
-#ifdef IN_RING3
-#include <iprt/alloc.h>
@@ -871 +872 @@
-
-    freq = TMTimerGetFreq (s->CTXSUFF(ts));
-muldiv64
+ASMMultU64ByU32DivByU32
-    Log (("interval = %RU64\n", interval));
-    TMTimerSet (s->CTXSUFF(ts), TMTimerGet (s->CTXSUFF(ts)) + interval);
@@ -1216 +1217 @@
-        int64_t elapsed = now - s->pm_timer_initial;
-
-muldiv64
+ASMMultU64ByU32DivByU32
-        Log (("acpi: acpiPMTmrRead -> %#x\n", *pu32));
-        return VINF_SUCCESS;

trunk/src/VBox/Devices/PC/DevDMA.cpp

@@ -169 +169 @@
-static void write_page (void *opaque, uint32_t nport, uint32_t data)
-{
-
+(struct dma_cont*)
-    int ichan;
-
@@ -182 +182 @@
-static void write_pageh (void *opaque, uint32_t nport, uint32_t data)
-{
-
+(struct dma_cont*)
-    int ichan;
-
@@ -195 +195 @@
-static uint32_t read_page (void *opaque, uint32_t nport)
-{
-
+(struct dma_cont*)
-    int ichan;
-
@@ -208 +208 @@
-static uint32_t read_pageh (void *opaque, uint32_t nport)
-{
-
+(struct dma_cont*)
-    int ichan;
-
@@ -239 +239 @@
-static uint32_t read_chan (void *opaque, uint32_t nport)
-{
-
+(struct dma_cont*)
-    int ichan, nreg, iport, ff, val, dir;
-    struct dma_regs *r;
@@ -261 +261 @@
-static void write_chan (void *opaque, uint32_t nport, uint32_t data)
-{
-
+(struct dma_cont*)
-    int iport, ichan, nreg;
-    struct dma_regs *r;
@@ -279 +279 @@
-static void write_cont (void *opaque, uint32_t nport, uint32_t data)
-{
-
+(struct dma_cont*)
-    int iport, ichan = 0;
-
@@ -363 +363 @@
-static uint32_t read_cont (void *opaque, uint32_t nport)
-{
-
+(struct dma_cont*)
-    int iport, val;
-
@@ -480 +480 @@
-
-    if (r->mode & 0x20) {
-int
-
+unsigned
+(uint8_t*)
-
-#ifdef VBOX
@@ -513 +513 @@
-
-    if (r->mode & 0x20) {
-int
+unsigned
-        uint8_t *p = (uint8_t *) buf;
-
@@ -548 +548 @@
-static void dma_reset(void *opaque)
-{
-
+(struct dma_cont*)
-    write_cont (d, (0x0d << d->dshift), 0);
-}
@@ -727 +727 @@
-static void dma_save (QEMUFile *f, void *opaque)
-{
-
+(struct dma_cont*)
-    int i;
-
@@ -752 +752 @@
-static int dma_load (QEMUFile *f, void *opaque, int version_id)
-{
-
+(struct dma_cont*)
-    int i;
-

trunk/src/VBox/Devices/PC/DevPit-i8254.cpp

@@ -53 +53 @@
-#define LOG_GROUP LOG_GROUP_DEV_PIT
-#include <VBox/pdm.h>
-
-#include <VBox/log.h>
+#include <VBox/stam.h>
-#include <iprt/assert.h>
-
-
-
-
+
+
+
-
-/*******************************************************************************
@@ -172 +171 @@
-        d = TMTimerGet(pTimer);
-        d -= s->u64ReloadTS;
-muldiv64
+ASMMultU64ByU32DivByU32
-#else /* variable time because of catch up */
-        if (s->u64NextTS == UINT64_MAX)
-            return 1; /** @todo check this value. */
-        d = TMTimerGet(pTimer);
-muldiv64
+ASMMultU64ByU32DivByU32
-#endif
-        if (d >= s->count)
@@ -183 +182 @@
-        return s->count - d;
-    }
-muldiv64
+ASMMultU64ByU32DivByU32
-    switch(s->mode) {
-    case 0:
@@ -210 +209 @@
-    int out;
-
-muldiv64
+ASMMultU64ByU32DivByU32
-    switch(s->mode) {
-    default:
@@ -259 +258 @@
-        s->count_latched = s->rw_mode;
-        LogFlow(("pit_latch_count: latched_count=%#06x / %10RU64 ns (c=%#06x m=%d)\n",
-muldiv64
+ASMMultU64ByU32DivByU32
-    }
-}
@@ -316 +315 @@
-    uint32_t period2;
-
-muldiv64
+ASMMultU64ByU32DivByU32
-    switch(s->mode) {
-    default:
@@ -366 +365 @@
-    /* convert to timer units */
-    LogFlow(("PIT: next_time=%14RI64 %20RI64 mode=%#x count=%#06x\n", next_time,
-muldiv64
-muldiv64
+ASMMultU64ByU32DivByU32
+ASMMultU64ByU32DivByU32
-    /* fix potential rounding problems */
-    /* XXX: better solution: use a clock at PIT_FREQ Hz */
@@ -418 +417 @@
-                LogFlow(("PIT: m=%d cnt=%#4x irq=%#x delay=%8RI64 next=%20RI64 now=%20RI64 load=%20RI64 %9RI64 delta=%9RI64\n",
-                         s->mode, s->count, irq_level, quarter, s->u64NextTS, now, s->count_load_time,
-muldiv64
+ASMMultU64ByU32DivByU32
-            }
-            else
@@ -427 +426 @@
-                LogFlow(("PIT: m=%d cnt=%#4x irq=%#x delay=%8RI64 next=%20RI64 now=%20RI64 load=%20RI64 %9RI64 delta=%9RI64 giving up!\n",
-                         s->mode, s->count, irq_level, quarter, s->u64NextTS, now, s->count_load_time,
-muldiv64
+ASMMultU64ByU32DivByU32
-            }
-        }
@@ -436 +435 @@
-            LogFlow(("PIT: m=%d cnt=%#4x irq=%#x delay=%8RI64 next=%20RI64 now=%20RI64 load=%20RI64 %9RI64\n",
-                     s->mode, s->count, irq_level, expire_time - now, expire_time, now, s->count_load_time,
-muldiv64
+ASMMultU64ByU32DivByU32
-        }
-        TMTimerSet(s->CTXSUFF(pTimer), s->u64NextTS);

trunk/src/VBox/Devices/PC/DevRTC.cpp

@@ -52 +52 @@
-#define LOG_GROUP LOG_GROUP_DEV_RTC
-#include <VBox/pdm.h>
-
-#include <VBox/log.h>
+#include <iprt/asm.h>
-#include <iprt/assert.h>
-
@@ -163 +163 @@
-        freq = TMTimerGetFreq(s->CTXSUFF(pPeriodicTimer));
-
-muldiv64
+ASMMultU64ByU32DivByU32
-        next_irq_clock = (cur_clock & ~(uint64_t)(period - 1)) + period;
-muldiv64
+ASMMultU64ByU32DivByU32
-
-        /* fiddly bits for dealing with running to keep up and losing interrupts. */
-muldiv64
+ASMMultU64ByU32DivByU32
-        now = TMTimerGet(s->CTXSUFF(pPeriodicTimer));
-        delta = s->next_periodic_time - now;

trunk/src/VBox/Devices/PC/Etherboot-src/Makefile.kmk

@@ -198 +198 @@
-# General rules for compiling/assembling source files.
-$(PATH_TARGET)/%.o: core/%.c $(MAKEDEPS)
-L1,Compiling $<,=> $@
+COMPILE,$@,$<,$@,CC
-        $(QUIET)$(EB_CC) $(EB_CFLAGS) -o $@ -c $<
-
-$(PATH_TARGET)/%.o: drivers/net/%.c $(MAKEDEPS)
-L1,Compiling $<,=> $@
+COMPILE,$@,$<,$@,CC
-        $(QUIET)$(EB_CC) $(EB_CFLAGS) -o $@ -c $<
-
-$(PATH_TARGET)/%.o: arch/$(ARCH)/core/%.c $(MAKEDEPS)
-L1,Compiling $<,=> $@
+COMPILE,$@,$<,$@,CC
-        $(QUIET)$(EB_CC) $(EB_CFLAGS) -o $@ -c $<
-
@@ -227 +227 @@
-# General rules for generating runtime (rt) files.
-$(PATH_TARGET)/%.rt.o: $(PATH_TARGET)/%.o $(START) $(PATH_TARGET)/config.o $(BLIB) $(MAKEDEPS)
+        $(call MSG_LINK,$@,$@)
-        $(call MSG_L1,Linking $@)
-        $(QUIET)$(EB_LD) $(EB_LDFLAGS) -r $(START) $(PATH_TARGET)/config.o $< $(BLIB) -o $@

trunk/src/VBox/Devices/vl_vbox.h

@@ -173 +173 @@
- * Misc.
- */
-uint64_t muldiv64(uint64_t a, uint32_t b, uint32_t c);
-
-
-#ifdef _MSC_VER