cleaned out cpu code, renamed some include files to .inc

[[Split portion of a mixed commit.]]

drivers/win/debugger.cpp

@@ -288,7 +288,7 @@ char *BinToASM(int addr, uint8 *opcode) {
 	uint16 tmp,tmp2;
 
 	switch (opcode[0]) {
-		#include "dasm.h"
+		#include "dasm.inc"
 	}
 	
 	return str;
@@ -690,7 +690,7 @@ int ParseASM(unsigned char *output, int addr, char *str) {
 	// 1) Sets opcode[0] on success, else returns 1.
 	// 2) Parses text in *astr to build the rest of the assembled
 	//    data in 'opcode', else returns 1 on error.
-	#include "asm.h"
+	#include "asm.inc"
 
 	memcpy(output,opcode,3);
 	return 0;

x6502.cpp

@@ -24,10 +24,7 @@
 #include "x6502.h"
 #include "fceu.h"
 #include "sound.h"
-//mbg merge 6/29/06
 #include "debug.h"
-//#include "tracer.h" //bbit edited: line added
-//#include "memview.h" //bbit edited: line added
 #include "driver.h"
 
 X6502 X;
@@ -40,24 +37,6 @@ X6502 X;
 uint32 timestamp;
 void FP_FASTAPASS(1) (*MapIRQHook)(int a);
 
-//-------
-//mbg merge 6/29/06
-//bbit edited: a large portion of code was inserted from here on down
-extern uint8 *XBuf;
-//extern void FCEUD_BlitScreen(uint8 *XBuf);
-void FCEUD_Update(uint8 *XBuf, int32 *Buffer, int Count); //mbg merge 6/30/06 - do this instead
-
-
-
-
-
-
-
-
-
-
-
-
 #define ADDCYC(x) \
 {     \
  int __x=x;       \
@@ -66,7 +45,6 @@ void FCEUD_Update(uint8 *XBuf, int32 *Buffer, int Count); //mbg merge 6/30/06 -
  timestamp+=__x;  \
 }
 
-
 //mbg 6/30/06 - hooked functions arent being used right now
 ////hooked memory read
 //static INLINE uint8 RdMemHook(unsigned int A)
@@ -556,7 +534,7 @@ void X6502_Run(int32 cycles)
    _PC++;
    switch(b1)
    {
-    #include "ops.h"
+    #include "ops.inc"
    }
   }