timer fixes

[palacios.git] / palacios / src / devices / 8254.c

diff --git a/palacios/src/devices/8254.c b/palacios/src/devices/8254.c
index df0c169..fa51251 100644 (file)
--- a/palacios/src/devices/8254.c
+++ b/palacios/src/devices/8254.c
@@ -1,3 +1,22 @@
+/*
+ * This file is part of the Palacios Virtual Machine Monitor developed
+ * by the V3VEE Project with funding from the United States National 
+ * Science Foundation and the Department of Energy.  
+ *
+ * The V3VEE Project is a joint project between Northwestern University
+ * and the University of New Mexico.  You can find out more at 
+ * http://www.v3vee.org
+ *
+ * Copyright (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> 
+ * Copyright (c) 2008, The V3VEE Project <http://www.v3vee.org> 
+ * All rights reserved.
+ *
+ * Author: Jack Lange <jarusl@cs.northwestern.edu>
+ *
+ * This is free software.  You are permitted to use,
+ * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
+ */
+
 #include <devices/8254.h>
 #include <palacios/vmm.h>
 #include <palacios/vmm_time.h>
@@ -134,15 +153,21 @@ static int handle_crystal_tics(struct vm_device * dev, struct channel * ch, uint
     return output_changed;
   } else {
     ushort_t reload_val = ch->reload_value; 
+
+    // TODO: Check this....
+    // Is this correct???
+    if (reload_val == 0) {
+      reload_val = 1;
+    }
+
     oscillations -= ch->counter;
     ch->counter = 0;
     channel_cycles = 1;
 
-    
     if (ch->op_mode == SQR_WAVE) {
       reload_val -= reload_val % 2;
     }
-    
+
     channel_cycles += oscillations / reload_val;
     oscillations = oscillations % reload_val;
 
@@ -221,7 +246,7 @@ static void pit_update_time(ullong_t cpu_cycles, ullong_t cpu_freq, void * priva
     // Easy...
     state->pit_counter -= cpu_cycles;
   } else {
-    
+    ushort_t reload_val = state->pit_reload;
     // Take off the first part
     cpu_cycles -= state->pit_counter;
     state->pit_counter = 0;
@@ -229,10 +254,26 @@ static void pit_update_time(ullong_t cpu_cycles, ullong_t cpu_freq, void * priva
     
     if (cpu_cycles > state->pit_reload) {
       // how many full oscillations
+      
+      // PrintError("cpu_cycles = %p, reload = %p...\n", 
+      //        (void *)(addr_t)cpu_cycles, 
+      //        (void *)(addr_t)state->pit_reload);
+
+      // How do we check for a one shot....
+      if (state->pit_reload == 0) {
+       reload_val = 1;
+      }
+
       tmp_cycles = cpu_cycles;
 
+      
+#ifdef __V3_64BIT__
+      cpu_cycles = tmp_cycles / state->pit_reload;
+      tmp_cycles = tmp_cycles % state->pit_reload;
+#else
       cpu_cycles = do_divll(tmp_cycles, state->pit_reload);
-
+#endif
+       
       oscillations += tmp_cycles;
     }
 
@@ -547,10 +588,10 @@ static int pit_init(struct vm_device * dev) {
   uint_t cpu_khz = V3_CPU_KHZ();
   ullong_t reload_val = (ullong_t)cpu_khz * 1000;
 
-  dev_hook_io(dev, CHANNEL0_PORT, &pit_read_channel, &pit_write_channel);
-  dev_hook_io(dev, CHANNEL1_PORT, &pit_read_channel, &pit_write_channel);
-  dev_hook_io(dev, CHANNEL2_PORT, &pit_read_channel, &pit_write_channel);
-  dev_hook_io(dev, COMMAND_PORT, NULL, &pit_write_command);
+  v3_dev_hook_io(dev, CHANNEL0_PORT, &pit_read_channel, &pit_write_channel);
+  v3_dev_hook_io(dev, CHANNEL1_PORT, &pit_read_channel, &pit_write_channel);
+  v3_dev_hook_io(dev, CHANNEL2_PORT, &pit_read_channel, &pit_write_channel);
+  v3_dev_hook_io(dev, COMMAND_PORT, NULL, &pit_write_command);
 
 #ifdef DEBUG_PIT
   PrintDebug("8254 PIT: OSC_HZ=%d, reload_val=", OSC_HZ);
@@ -597,12 +638,12 @@ static struct vm_device_ops dev_ops = {
 };
 
 
-struct vm_device * create_pit() {
+struct vm_device * v3_create_pit() {
   struct pit * pit_state = NULL;
   pit_state = (struct pit *)V3_Malloc(sizeof(struct pit));
   V3_ASSERT(pit_state != NULL);
 
-  struct vm_device * dev = create_device("PIT", &dev_ops, pit_state);
+  struct vm_device * dev = v3_create_device("PIT", &dev_ops, pit_state);
   
   return dev;
 }