--- trunk/src/devices/dev_mp.c	2007/10/08 16:18:51	14
+++ trunk/src/devices/dev_mp.c	2007/10/08 16:22:32	42
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2003-2005  Anders Gavare.  All rights reserved.
+ *  Copyright (C) 2003-2007  Anders Gavare.  All rights reserved.
  *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions are met:
@@ -25,11 +25,16 @@
  *  SUCH DAMAGE.
  *   
  *
- *  $Id: dev_mp.c,v 1.28 2005/09/18 19:54:15 debug Exp $
+ *  $Id: dev_mp.c,v 1.42 2007/06/15 19:57:33 debug Exp $
+ *
+ *  COMMENT: Generic Multi-processor controller for the test machines
  *
  *  This is a fake multiprocessor (MP) device. It can be useful for
  *  theoretical experiments, but probably bares no resemblance to any
  *  multiprocessor controller used in any real machine.
+ *
+ *  NOTE: The devinit irq string should be the part _after_ "cpu[%i].".
+ *        For MIPS, it will be MIPS_IPI_INT.
  */
 
 #include <stdio.h>
@@ -37,12 +42,13 @@
 #include <string.h>
 
 #include "cpu.h"
-#include "cpu_mips.h"
 #include "device.h"
 #include "machine.h"
+#include "interrupt.h"
 #include "memory.h"
 #include "misc.h"
-#include "mp.h"
+
+#include "testmachine/dev_mp.h"
 
 
 struct mp_data {
@@ -54,23 +60,23 @@
 	/*  Each CPU has an array of pending ipis.  */
 	int		*n_pending_ipis;
 	int		**ipi;
+
+	/*  Connections to all CPUs' IPI pins:  */
+	struct interrupt *ipi_irq;
 };
 
 
 extern int single_step;
 
 
-/*
- *  dev_mp_access():
- */
-int dev_mp_access(struct cpu *cpu, struct memory *mem, uint64_t relative_addr,
-	unsigned char *data, size_t len, int writeflag, void *extra)
+DEVICE_ACCESS(mp)
 {
 	struct mp_data *d = extra;
 	int i, which_cpu;
 	uint64_t idata = 0, odata = 0;
 
-        idata = memory_readmax64(cpu, data, len);
+	if (writeflag == MEM_WRITE)
+	        idata = memory_readmax64(cpu, data, len);
 
 	/*
 	 *  NOTE: It is up to the user of this device to read or write
@@ -120,20 +126,20 @@
 		break;
 
 	case DEV_MP_PAUSE_CPU:
-		/*  Pause all cpus except our selves:  */
+		/*  Pause all cpus except a specific CPU:  */
 		which_cpu = idata;
 
 		for (i=0; i<cpu->machine->ncpus; i++)
-			if (i!=which_cpu)
+			if (i != which_cpu)
 				d->cpus[i]->running = 0;
 		break;
 
 	case DEV_MP_UNPAUSE_CPU:
-		/*  Unpause all cpus except our selves:  */
+		/*  Unpause a specific CPU:  */
 		which_cpu = idata;
-		for (i=0; i<cpu->machine->ncpus; i++)
-			if (i!=which_cpu)
-				d->cpus[i]->running = 1;
+
+		if (which_cpu >= 0 && which_cpu <cpu->machine->ncpus)
+			d->cpus[which_cpu]->running = 1;
 		break;
 
 	case DEV_MP_STARTUPSTACK:
@@ -143,7 +149,12 @@
 		break;
 
 	case DEV_MP_HARDWARE_RANDOM:
-		/*  Return (up to) 64 bits of "hardware random":  */
+		/*
+		 *  Return (up to) 64 bits of "hardware random":
+		 *
+		 *  NOTE: Remember that random() is (usually) 31 bits of
+		 *        random data, _NOT_ 32, hence this construction.
+		 */
 		odata = random();
 		odata = (odata << 31) ^ random();
 		odata = (odata << 31) ^ random();
@@ -183,16 +194,14 @@
 				send_it = 1;
 			if (send_it) {
 				d->n_pending_ipis[i] ++;
-				d->ipi[i] = realloc(d->ipi[i],
-				    d->n_pending_ipis[i] * sizeof(int));
-				if (d->ipi[i] == NULL) {
-					fprintf(stderr, "out of memory\n");
-					exit(1);
-				}
+				CHECK_ALLOCATION(d->ipi[i] = realloc(d->ipi[i],
+				    d->n_pending_ipis[i] * sizeof(int)));
+
 				/*  Add the IPI last in the array:  */
 				d->ipi[i][d->n_pending_ipis[i] - 1] =
 				    idata >> 16;
-				cpu_interrupt(d->cpus[i], MIPS_IPI_INT);
+
+				INTERRUPT_ASSERT(d->ipi_irq[i]);
 			}
 		}
 		break;
@@ -216,18 +225,20 @@
 				    &d->ipi[cpu->cpu_id][1],
 				    d->n_pending_ipis[cpu->cpu_id]);
 		}
+
 		/*  Deassert the interrupt, if there are no pending IPIs:  */
 		if (d->n_pending_ipis[cpu->cpu_id] == 0)
-			cpu_interrupt_ack(d->cpus[cpu->cpu_id], MIPS_IPI_INT);
+			INTERRUPT_DEASSERT(d->ipi_irq[cpu->cpu_id]);
 		break;
 
 	case DEV_MP_NCYCLES:
 		/*
-		 *  Return approximately the number of cycles executed
-		 *  in this machine.  (This value is not updated for each
-		 *  instruction.)
+		 *  Return _approximately_ the number of cycles executed
+		 *  on this CPU.
+		 *
+		 *  (This value is not updated for each instruction.)
 		 */
-		odata = cpu->machine->ncycles;
+		odata = cpu->ninstrs;
 		break;
 
 	default:
@@ -242,36 +253,38 @@
 }
 
 
-/*
- *  devinit_mp():
- */
-int devinit_mp(struct devinit *devinit)
+DEVINIT(mp)
 {
 	struct mp_data *d;
-	int n;
+	int n, i;
 
-	d = malloc(sizeof(struct mp_data));
-	if (d == NULL) {
-		fprintf(stderr, "out of memory\n");
-		exit(1);
-	}
+	CHECK_ALLOCATION(d = malloc(sizeof(struct mp_data)));
 	memset(d, 0, sizeof(struct mp_data));
+
 	d->cpus = devinit->machine->cpus;
 	d->startup_addr = INITIAL_PC;
 	d->stack_addr = INITIAL_STACK_POINTER;
 
 	n = devinit->machine->ncpus;
-	d->n_pending_ipis = malloc(n * sizeof(int));
-	d->ipi = malloc(n * sizeof(int *));
-	if (d->ipi == NULL || d->n_pending_ipis == NULL) {
-		fprintf(stderr, "out of memory\n");
-		exit(1);
+
+	/*  Connect to all CPUs' IPI pins:  */
+	CHECK_ALLOCATION(d->ipi_irq = malloc(n * sizeof(struct interrupt)));
+
+	for (i=0; i<n; i++) {
+		char tmpstr[200];
+		snprintf(tmpstr, sizeof(tmpstr), "%s.cpu[%i].%s",
+		    devinit->machine->path, i, devinit->interrupt_path);
+		INTERRUPT_CONNECT(tmpstr, d->ipi_irq[i]);
 	}
+
+	CHECK_ALLOCATION(d->n_pending_ipis = malloc(n * sizeof(int)));
 	memset(d->n_pending_ipis, 0, sizeof(int) * n);
+
+	CHECK_ALLOCATION(d->ipi = malloc(n * sizeof(int *)));
 	memset(d->ipi, 0, sizeof(int *) * n);
 
 	memory_device_register(devinit->machine->memory, devinit->name,
-	    devinit->addr, DEV_MP_LENGTH, dev_mp_access, d, MEM_DEFAULT, NULL);
+	    devinit->addr, DEV_MP_LENGTH, dev_mp_access, d, DM_DEFAULT, NULL);
 
 	return 1;
 }