}
-static int route_ipi(struct guest_info * core, struct apic_dev_state * apic_dev,
- struct apic_state * src_apic, uint32_t icr_val) {
- struct int_cmd_reg * icr = (struct int_cmd_reg *)&icr_val;
+static int route_ipi(struct apic_dev_state * apic_dev,
+ struct apic_state * src_apic,
+ struct int_cmd_reg * icr) {
struct apic_state * dest_apic = NULL;
- PrintDebug("icc_bus: icc_bus=%p, src_apic=%u, icr_data=%llx, extirq=%u\n",
- icc_bus, src_apic, icr_data, extirq);
+ PrintDebug("route_ipi: src_apic=%p, icr_data=%x",
+ src_apic, icr_val);
- // initial sanity checks
- if (src_apic == NULL) {
- PrintError("route_ipi: Apparently sending from unregistered apic id=%d\n",
- src_apic->core->cpu_id);
- return -1;
- }
-
-
if ((icr->dst_mode == 0) && (icr->dst >= apic_dev->num_apics)) {
- PrintError("icc_bus: Attempted send to unregistered apic id=%u\n",
+ PrintError("route_ipi: Attempted send to unregistered apic id=%u\n",
icr->dst);
return -1;
}
#define PTRDIFF_T_RANK rank_long
/* DHH */
--#define EMIT(x) do { (q)->Emit((q), (x)); } while (0)
++#include <geekos/vm_cons.h>
++#define EMIT(x) do { if (q == NULL) {(q)->Emit((q), (x));} } while (0)
/*
* DHH - As a hack, we buffer this many digits when generating
};
#define BFH(p) ((struct bfhead *) (p))
--static struct bfhead freelist = { /* List of free buffers */
-- {0, 0},
-- {&freelist, &freelist}
--};
++static struct bfhead freelist; /* List of free buffers */
++
++
#ifdef BufStats
assert(len - sizeof(struct bhead) <= -((bufsize) ESent + 1));
++ /* Initialize Free list since compile time static initializations appear to be broken */
++ freelist.bh.prevfree = 0;
++ freelist.bh.bsize = 0;
++ freelist.ql.flink = &freelist;
++ freelist.ql.blink = &freelist;
++
++
++
/* Clear the backpointer at the start of the block to indicate that
there is no free block prior to this one. That blocks
recombination when the first block in memory is released. */
{
struct Kernel_Thread * key_thread;
struct Kernel_Thread * spkr_thread;
ulong_t doIBuzz = 0;
Init_BSS();
++ Init_VMCons();
Init_Screen();
InitSerial();
--
-- Init_VMCons();
++ Print("Initializing Memory\n");
Init_Mem(bootInfo);
++ Print("Memory Done\n");
Init_CRC32();
Init_TSS();
Init_Interrupts();
--
--
--
--
PrintBoth("\n\nHello, Welcome to this horrid output-only serial interface\n");
PrintBoth("Eventually, this will let us control the VMM\n\n");
*/
void Init_Heap(ulong_t start, ulong_t size)
{
-- /*Print("Creating kernel heap: start=%lx, size=%ld\n", start, size);*/
++ Print("Creating kernel heap: start=%lx, size=%ld\n", start, size);
bpool((void*) start, size);
}
ulong_t pageListAddr;
ulong_t kernEnd;
++
++ memset(&s_freeList, 0, sizeof(struct Page_List));
++
KASSERT(bootInfo->memSizeKB > 0);
++ Print("Booting with %d KB memory\n", bootInfo->memSizeKB);
/*
* Before we do anything, switch from setup.asm's temporary GDT
/* Initialize the kernel heap */
// Init_Heap(HIGHMEM_START, KERNEL_HEAP_SIZE);
++
++ Print("Initing heap\n");
Init_Heap(kernEnd, KERNEL_HEAP_SIZE);
Print("%uKB memory detected, %u pages in freelist, %d bytes in kernel heap\n",
-- bootInfo->memSizeKB, g_freePageCount, KERNEL_HEAP_SIZE);
++ bootInfo->memSizeKB, g_freePageCount, KERNEL_HEAP_SIZE);
}
/*
#include <geekos/int.h>
#include <geekos/fmtout.h>
#include <geekos/screen.h>
++#include <geekos/vm_cons.h>
/*
* Information sources for VT100 and ANSI escape sequences:
* Public functions
* ---------------------------------------------------------------------- */
--/*
-- * Initialize the screen module.
-- */
--void Init_Screen(void)
--{
-- bool iflag = Begin_Int_Atomic();
--
-- s_cons.row = s_cons.col = 0;
-- s_cons.currentAttr = DEFAULT_ATTRIBUTE;
-- Clear_Screen();
--
-- End_Int_Atomic(iflag);
-- Print("Screen Inited\n");
--}
/*
* Clear the screen using the current attribute.
/* Support for Print(). */
static void Print_Emit(struct Output_Sink *o, int ch) { Put_Char_Imp(ch); }
static void Print_Finish(struct Output_Sink *o) { Update_Cursor(); }
--static struct Output_Sink s_outputSink = { &Print_Emit, &Print_Finish };
++static struct Output_Sink s_outputSink;
/*
* Print to console using printf()-style formatting.
PrintInternal(fmt, ap);
End_Int_Atomic(iflag);
}
++
++
++/*
++ * Initialize the screen module.
++ */
++void Init_Screen(void)
++{
++ bool iflag = Begin_Int_Atomic();
++
++ s_outputSink.Emit = &Print_Emit;
++ s_outputSink.Finish = &Print_Finish;
++
++ s_cons.row = s_cons.col = 0;
++ s_cons.currentAttr = DEFAULT_ATTRIBUTE;
++ Clear_Screen();
++
++ End_Int_Atomic(iflag);
++ Print("Screen Inited\n");
++}
