X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=src%2Fcpu8051.c;h=4e3a6567f2ec7471da451cf96a31c7dce1d794ed;hb=fc4dd8fa3aab94a5f63c097ed9809c75560abd7d;hp=1bdc42ef9a3079c080037894bc50a24908bacb78;hpb=4c305c73f8110d03b99cec045b3c5741867fd46b;p=emu8051.git

diff --git a/src/cpu8051.c b/src/cpu8051.c
index 1bdc42e..4e3a656 100644
--- a/src/cpu8051.c
+++ b/src/cpu8051.c
@@ -1,4 +1,26 @@
-/* cpu8051.c */
+/*
+ * cpu8051.c
+ *
+ * Copyright (C) 1999 Jonathan St-André
+ * Copyright (C) 1999 Hugo Villeneuve <hugo@hugovil.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+/* Define only here, for not having extern scope on local variables. */
+#define CPU8051_M 1
 
 
 #include <stdio.h>
@@ -10,16 +32,17 @@
 #include "instructions_8051.h"
 
 
-unsigned int PC = 0;
-unsigned long CLOCK = 0;
-int ActivePriority = -1;
-
-
-extern OPCODE_FP opcode_table[256];
+void
+cpu8051_init( void )
+{
+  cpu8051.pc = 0;
+  cpu8051.clock = 0;
+  cpu8051.active_priority = -1;
+}
 
 
 //////////////////////////////////////////////////////////////////////////////
-// Execute at address PC from PGMMem
+// Execute at address cpu8051.pc from PGMMem
 //////////////////////////////////////////////////////////////////////////////
 void
 cpu8051_Exec( void )
@@ -28,26 +51,26 @@ cpu8051_Exec( void )
   unsigned char opcode;
   int insttiming;
 
-  opcode = memory_read8( PGM_MEM_ID, PC );
-  PC++;
+  opcode = memory_read8( PGM_MEM_ID, cpu8051.pc );
+  cpu8051.pc++;
   insttiming = (*opcode_table[opcode])(); /* Function callback. */
   
   for( i = 0; i < insttiming; i++ ) {
     cpu8051_CheckInterrupts();
     cpu8051_DoTimers();
-    CLOCK++;
+    cpu8051.clock++;
   }
 }
 
 
 //////////////////////////////////////////////////////////////////////////////
-// Return PC + size in bytes of current instruction
+// Return cpu8051.pc + size in bytes of current instruction
 //////////////////////////////////////////////////////////////////////////////
 unsigned int
 cpu8051_GetNextAddress( void )
 {
 #ifdef DECPP
-  return ( PC + InstSizesTbl[ memory_read8( PGM_MEM_ID, PC ) ] );
+  return ( cpu8051.pc + InstSizesTbl[ memory_read8( PGM_MEM_ID, cpu8051.pc ) ] );
 #endif
   return 0; /* temp */
 }
@@ -59,9 +82,9 @@ cpu8051_GetNextAddress( void )
 void
 cpu8051_Reset( void )
 {
-  PC = 0;
-  CLOCK = 0;
-  ActivePriority = -1;
+  cpu8051.pc = 0;
+  cpu8051.clock= 0;
+  cpu8051.active_priority = -1;
 
   // Reinitialisation des registres
   int i;
@@ -238,18 +261,18 @@ cpu8051_CheckInterrupts()
 
   if ( cpu8051_ReadD( _IE_ ) & 0x80 ) {
     for ( i = 1; i >= 0; i-- )
-      if ( ActivePriority < i ) {
+      if ( cpu8051.active_priority < i ) {
 	//-------------------------  External interrupt 0 ----------------------------     
 	//        if ( ( cpu8051_ReadD( _IE_ ) & 0x01 ) && ( ( cpu8051_ReadD( _IP_ ) & 0x01 ) ? i : !i ) && pin0 )
 	//-------------------------- Interrupt timer 0 -------------------------------
 	if ( ( cpu8051_ReadD( _IE_ ) & 0x02 ) && ( ( cpu8051_ReadD( _IP_ & 0x02 ) ? i : !i ) && ( cpu8051_ReadD( _TCON_ ) & 0x20 ) ) ){
 	  cpu8051_WriteD( _TCON_, cpu8051_ReadD( _TCON_ ) & 0xDF );
 	  SP = cpu8051_ReadD( _SP_ );
-	  cpu8051_WriteI( ++SP, ( PC & 0xFF ) );
-	  cpu8051_WriteI( ++SP, ( PC >> 8 ) );
+	  cpu8051_WriteI( ++SP, ( cpu8051.pc & 0xFF ) );
+	  cpu8051_WriteI( ++SP, ( cpu8051.pc >> 8 ) );
 	  cpu8051_WriteD( _SP_, SP );
-	  PC = 0x0B;  
-	  ActivePriority = i;
+	  cpu8051.pc = 0x0B;  
+	  cpu8051.active_priority = i;
 	  return;          
 	}
 	//-------------------------- External interrupt 1 ----------------------------     
@@ -258,31 +281,31 @@ cpu8051_CheckInterrupts()
 	if ( ( cpu8051_ReadD( _IE_ ) & 0x08 ) && ( ( cpu8051_ReadD( _IP_ ) & 0x08 ) ? i : !i ) && ( cpu8051_ReadD( _TCON_ ) & 0x80 ) ) {
 	  cpu8051_WriteD( _TCON_, cpu8051_ReadD( _TCON_ ) & 0x7F );
 	  SP = cpu8051_ReadD( _SP_ );
-	  cpu8051_WriteI( ++SP, ( PC & 0xFF ) );
-	  cpu8051_WriteI( ++SP, ( PC >> 8 ) );
+	  cpu8051_WriteI( ++SP, ( cpu8051.pc & 0xFF ) );
+	  cpu8051_WriteI( ++SP, ( cpu8051.pc >> 8 ) );
 	  cpu8051_WriteD( _SP_, SP );
-	  PC = 0x1B;
-	  ActivePriority = i;
+	  cpu8051.pc = 0x1B;
+	  cpu8051.active_priority = i;
 	  return;
 	}
 	//-------------------------- Serial Interrupts -------------------------------
 	if ( ( cpu8051_ReadD( _IE_ ) & 0x10 ) && ( ( cpu8051_ReadD( _IP_ ) & 0x10 ) ? i : !i ) && ( cpu8051_ReadD( _SCON_ ) & 0x03 ) ) {
 	  SP = cpu8051_ReadD( _SP_ );
-	  cpu8051_WriteI( ++SP, ( PC & 0xFF ) );
-	  cpu8051_WriteI( ++SP, ( PC >> 8 ) );
+	  cpu8051_WriteI( ++SP, ( cpu8051.pc & 0xFF ) );
+	  cpu8051_WriteI( ++SP, ( cpu8051.pc >> 8 ) );
 	  cpu8051_WriteD( _SP_, SP );
-	  PC = 0x23;
-	  ActivePriority = i;
+	  cpu8051.pc = 0x23;
+	  cpu8051.active_priority = i;
 	  return;
 	}
 	//-------------------------- Interrupt timer 2 -------------------------------
 	if ( ( cpu8051_ReadD( _IE_ ) & 0x20 ) && ( ( cpu8051_ReadD( _IP_ ) & 0x20 ) ? i : !i ) && ( cpu8051_ReadD( _T2CON_ ) & 0x80 ) ) {          
 	  SP = cpu8051_ReadD( _SP_ );
-	  cpu8051_WriteI( ++SP, ( PC & 0xFF ) );
-	  cpu8051_WriteI( ++SP, ( PC >> 8 ) );
+	  cpu8051_WriteI( ++SP, ( cpu8051.pc & 0xFF ) );
+	  cpu8051_WriteI( ++SP, ( cpu8051.pc >> 8 ) );
 	  cpu8051_WriteD( _SP_, SP );
-	  PC = 0x2B;
-	  ActivePriority = i;
+	  cpu8051.pc = 0x2B;
+	  cpu8051.active_priority = i;
 	  return;
 	}
       }