[mupen64plus-rsp-z64] 135/140: Imported Upstream version 2.0.0+12+g5a0a580

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch master
in repository mupen64plus-rsp-z64.

commit 7aabde322c44d2959f98861991cadaf61ab8a6da
Author: Sven Eckelmann <sven at narfation.org>
Date:   Tue Apr 28 22:34:04 2015 +0200

    Imported Upstream version 2.0.0+12+g5a0a580
---
 src/main_rsp.cpp   |  8 +++++++-
 src/rsp.cpp        |  7 ++++---
 src/rsp.h          | 10 ++++++----
 src/rsp_dasm.cpp   |  2 ++
 src/rsp_gen.cpp    |  5 +++--
 src/rsp_opinfo.cpp |  4 ++++
 src/rsp_opinfo.h   |  1 +
 src/rsp_recomp.cpp |  8 +++++++-
 src/rsp_recomp.h   |  1 +
 9 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/src/main_rsp.cpp b/src/main_rsp.cpp
index 4f2b8c5..ab772a3 100644
--- a/src/main_rsp.cpp
+++ b/src/main_rsp.cpp
@@ -19,9 +19,15 @@
  *
 **/
 
-#include "rsp.h"
 #include <assert.h>
 #include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "m64p_plugin.h"
+#include "m64p_types.h"
+#include "rsp.h"
+#include "z64.h"
 
 #define RSP_Z64_VERSION        0x020000
 #define RSP_PLUGIN_API_VERSION 0x020000
diff --git a/src/rsp.cpp b/src/rsp.cpp
index 04e65ec..0dc1f88 100644
--- a/src/rsp.cpp
+++ b/src/rsp.cpp
@@ -19,6 +19,10 @@
  *
 **/
 
+#include <assert.h>
+#include <math.h>       // sqrt
+#include <string.h>
+
 /*
 Nintendo/SGI Reality Signal Processor (RSP) emulator
 
@@ -27,9 +31,6 @@ Written by Ville Linde
 // #include "z64.h"
 #include "rsp.h"
 #include "rsp_opinfo.h"
-#include <math.h>       // sqrt
-#include <assert.h>
-#include <string.h>
 
 #define INLINE inline
 
diff --git a/src/rsp.h b/src/rsp.h
index 6c1cf73..c89e25d 100644
--- a/src/rsp.h
+++ b/src/rsp.h
@@ -23,14 +23,15 @@
 #define _RSP_H_
 
 #define M64P_PLUGIN_PROTOTYPES 1
-#include "m64p_types.h"
-#include "m64p_plugin.h"
-#include "z64.h"
 #include <math.h>       // sqrt
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>    // memset
 
+#include "m64p_plugin.h"
+#include "m64p_types.h"
+#include "z64.h"
+
 #define INLINE inline
 
 extern void log(m64p_msg_level level, const char *msg, ...);
@@ -412,6 +413,7 @@ inline uint64_t RDTSC() {
 #ifdef GENTRACE
 #undef GENTRACE
 #include <stdarg.h>
+
 inline void GENTRACE(const char * s, ...) {
     va_list ap;
     va_start(ap, s);
diff --git a/src/rsp_dasm.cpp b/src/rsp_dasm.cpp
index 40f557c..cdc2a2f 100644
--- a/src/rsp_dasm.cpp
+++ b/src/rsp_dasm.cpp
@@ -28,7 +28,9 @@
 //#include "z64.h"
 #include <stdarg.h>
 #include <stdio.h>
+
 #include "rsp.h"
+#include "z64.h"
 
 #define DASMFLAG_SUPPORTED         0x80000000      /* are disassembly flags supported? */
 #define DASMFLAG_STEP_OUT          0x40000000      /* this instruction should be the end of a step out sequence */
diff --git a/src/rsp_gen.cpp b/src/rsp_gen.cpp
index a7577f7..3ba35e1 100644
--- a/src/rsp_gen.cpp
+++ b/src/rsp_gen.cpp
@@ -19,12 +19,13 @@
  *
 **/
 
-#include "rsp.h"
+#include <assert.h>
 #include <dlfcn.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
-#include <assert.h>
+
+#include "rsp.h"
 
 #define GENDEBUG
 
diff --git a/src/rsp_opinfo.cpp b/src/rsp_opinfo.cpp
index d02b561..2344f7a 100644
--- a/src/rsp_opinfo.cpp
+++ b/src/rsp_opinfo.cpp
@@ -19,6 +19,10 @@
  *
 **/
 
+#include <string.h>
+
+#include "m64p_types.h"
+#include "rsp.h"
 #include "rsp_opinfo.h"
 
 static const int vector_elements_2[16][8] =
diff --git a/src/rsp_opinfo.h b/src/rsp_opinfo.h
index ac6f75a..f4b5e8c 100644
--- a/src/rsp_opinfo.h
+++ b/src/rsp_opinfo.h
@@ -20,6 +20,7 @@
 **/
 
 #include "rsp.h"
+#include "z64.h"
 
 struct rsp_regmask_t {
     //UINT32 r;
diff --git a/src/rsp_recomp.cpp b/src/rsp_recomp.cpp
index f771955..12f8650 100644
--- a/src/rsp_recomp.cpp
+++ b/src/rsp_recomp.cpp
@@ -19,8 +19,14 @@
  *
 **/
 
-#include "rsp_recomp.h"
 #include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "m64p_plugin.h"
+#include "m64p_types.h"
+#include "rsp.h"
+#include "rsp_recomp.h"
 
 #define GENDEBUG
 
diff --git a/src/rsp_recomp.h b/src/rsp_recomp.h
index 1e8d0a3..c3aa246 100644
--- a/src/rsp_recomp.h
+++ b/src/rsp_recomp.h
@@ -20,6 +20,7 @@
 **/
 
 #include "rsp_opinfo.h"
+#include "z64.h"
 
 struct rsp_bc_t {
     UINT32        op;   // original opcode

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-rsp-z64.git