diff options
author | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2017-10-28 11:01:38 +0000 |
---|---|---|
committer | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2017-10-28 11:01:38 +0000 |
commit | 272b2e4382dc0cdbf965dec6aa9cdab0278cb69f (patch) | |
tree | 6fe89177425fa78dae9ba338d3657505edc3a988 | |
parent | 0a478e04e33339591fd7e2799ace6e480f13441b (diff) | |
download | VirtualBox-svn-272b2e4382dc0cdbf965dec6aa9cdab0278cb69f.tar.gz |
recompiler: scm updates
git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@69465 cfe28804-0f27-0410-a406-dd0f0b0b656f
-rw-r--r-- | .scm-settings | 10 | ||||
-rw-r--r-- | src/recompiler/.scm-settings | 12 | ||||
-rw-r--r-- | src/recompiler/Sun/testmath.c | 10 | ||||
-rw-r--r-- | src/recompiler/tests/hello-arm.c | 2 | ||||
-rw-r--r-- | src/recompiler/tests/test-i386-muldiv.h | 16 |
5 files changed, 20 insertions, 30 deletions
diff --git a/.scm-settings b/.scm-settings index 8f236adb563..99d26c2fda6 100644 --- a/.scm-settings +++ b/.scm-settings @@ -80,14 +80,4 @@ /src/apps/tunctl/tunctl.c: --no-convert-tabs vboxvideo_drm.c: --no-convert-tabs *linux.mod.c: --no-convert-tabs -/src/recompiler/*: --no-convert-tabs -/src/recompiler/VBox*: --convert-tabs - - -# -# Files and sub-trees where we don't set forcibly set svn:keywords. -# -/src/recompiler/*: --dont-set-svn-keywords -/src/recompiler/VBox*: --set-svn-keywords - diff --git a/src/recompiler/.scm-settings b/src/recompiler/.scm-settings index f99fe1a2f47..409ccc7ef1e 100644 --- a/src/recompiler/.scm-settings +++ b/src/recompiler/.scm-settings @@ -17,12 +17,12 @@ # This is external stuff. ---external-copyright -/.scm-settings: --no-external-copyright -/Makefile.kmk: --no-external-copyright -/VBox*: --no-external-copyright -/Sun/*: --no-external-copyright -/Sun/e_*.S: --external-copyright +--external-copyright --no-convert-tabs +/.scm-settings: --no-external-copyright --convert-tabs +/Makefile.kmk: --no-external-copyright --convert-tabs +/VBox*: --no-external-copyright --convert-tabs +/Sun/*: --no-external-copyright --convert-tabs +/Sun/e_*.S: --external-copyright --no-convert-tabs *.com: --treat-as binary diff --git a/src/recompiler/Sun/testmath.c b/src/recompiler/Sun/testmath.c index f4f58384b3b..8ffd75a6b96 100644 --- a/src/recompiler/Sun/testmath.c +++ b/src/recompiler/Sun/testmath.c @@ -399,8 +399,8 @@ typedef union { /* the following deal with x86 long double-precision numbers */ #define MAXEXPD 0x7fff #define EXPBIAS 16383 -#define EXPD(fp) (fp.l.upper & 0x7fff) -#define SIGND(fp) ((fp.l.upper) & 0x8000) +#define EXPD(fp) (fp.l.upper & 0x7fff) +#define SIGND(fp) ((fp.l.upper) & 0x8000) #define MANTD(fp) (fp.l.lower) #define BIASEXPONENT(fp) fp.l.upper = (fp.l.upper & ~(0x7fff)) | EXPBIAS @@ -460,7 +460,7 @@ static void helper_fyl2x(void) fptemp = ST0; if (fptemp>0.0){ - fptemp = log(fptemp)/log(2.0); /* log2(ST) */ + fptemp = log(fptemp)/log(2.0); /* log2(ST) */ ST1 *= fptemp; fpop(); } else { @@ -527,7 +527,7 @@ static void helper_fprem1(void) ST0 = fpsrcop - fptemp*dblq; q = (int)dblq; /* cutting off top bits is assumed here */ env->fpus &= (~0x4700); /* (C3,C2,C1,C0) <-- 0000 */ - /* (C0,C1,C3) <-- (q2,q1,q0) */ + /* (C0,C1,C3) <-- (q2,q1,q0) */ env->fpus |= (q&0x4) << 6; /* (C0) <-- q2 */ env->fpus |= (q&0x2) << 8; /* (C1) <-- q1 */ env->fpus |= (q&0x1) << 14; /* (C3) <-- q0 */ @@ -574,7 +574,7 @@ LogFlow(("helper_fprem: -> ST0=%.*Rhxs fpus=%#x c\n", sizeof(ST0), &ST0, env->fp ST0 = fpsrcop - fptemp*dblq; q = (int)dblq; /* cutting off top bits is assumed here */ env->fpus &= (~0x4700); /* (C3,C2,C1,C0) <-- 0000 */ - /* (C0,C1,C3) <-- (q2,q1,q0) */ + /* (C0,C1,C3) <-- (q2,q1,q0) */ env->fpus |= (q&0x4) << 6; /* (C0) <-- q2 */ env->fpus |= (q&0x2) << 8; /* (C1) <-- q1 */ env->fpus |= (q&0x1) << 14; /* (C3) <-- q0 */ diff --git a/src/recompiler/tests/hello-arm.c b/src/recompiler/tests/hello-arm.c index f84e6cb3686..e0daa7ad981 100644 --- a/src/recompiler/tests/hello-arm.c +++ b/src/recompiler/tests/hello-arm.c @@ -83,7 +83,7 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4) { \ : "r0","r1","r2","r3","lr"); \ __syscall_return(type,__res); \ } - + #define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5) \ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) { \ diff --git a/src/recompiler/tests/test-i386-muldiv.h b/src/recompiler/tests/test-i386-muldiv.h index fd0d991341e..015f59e157d 100644 --- a/src/recompiler/tests/test-i386-muldiv.h +++ b/src/recompiler/tests/test-i386-muldiv.h @@ -1,5 +1,5 @@ -void glue(glue(test_, OP), b)(long op0, long op1) +void glue(glue(test_, OP), b)(long op0, long op1) { long res, s1, s0, flags; s0 = op0; @@ -8,7 +8,7 @@ void glue(glue(test_, OP), b)(long op0, long op1) flags = 0; asm ("push %4\n\t" "popf\n\t" - stringify(OP)"b %b2\n\t" + stringify(OP)"b %b2\n\t" "pushf\n\t" "pop %1\n\t" : "=a" (res), "=g" (flags) @@ -17,7 +17,7 @@ void glue(glue(test_, OP), b)(long op0, long op1) stringify(OP) "b", s0, s1, res, flags & CC_MASK); } -void glue(glue(test_, OP), w)(long op0h, long op0, long op1) +void glue(glue(test_, OP), w)(long op0h, long op0, long op1) { long res, s1, flags, resh; s1 = op1; @@ -26,7 +26,7 @@ void glue(glue(test_, OP), w)(long op0h, long op0, long op1) flags = 0; asm ("push %5\n\t" "popf\n\t" - stringify(OP) "w %w3\n\t" + stringify(OP) "w %w3\n\t" "pushf\n\t" "pop %1\n\t" : "=a" (res), "=g" (flags), "=d" (resh) @@ -35,7 +35,7 @@ void glue(glue(test_, OP), w)(long op0h, long op0, long op1) stringify(OP) "w", op0h, op0, s1, resh, res, flags & CC_MASK); } -void glue(glue(test_, OP), l)(long op0h, long op0, long op1) +void glue(glue(test_, OP), l)(long op0h, long op0, long op1) { long res, s1, flags, resh; s1 = op1; @@ -44,7 +44,7 @@ void glue(glue(test_, OP), l)(long op0h, long op0, long op1) flags = 0; asm ("push %5\n\t" "popf\n\t" - stringify(OP) "l %k3\n\t" + stringify(OP) "l %k3\n\t" "pushf\n\t" "pop %1\n\t" : "=a" (res), "=g" (flags), "=d" (resh) @@ -54,7 +54,7 @@ void glue(glue(test_, OP), l)(long op0h, long op0, long op1) } #if defined(__x86_64__) -void glue(glue(test_, OP), q)(long op0h, long op0, long op1) +void glue(glue(test_, OP), q)(long op0h, long op0, long op1) { long res, s1, flags, resh; s1 = op1; @@ -63,7 +63,7 @@ void glue(glue(test_, OP), q)(long op0h, long op0, long op1) flags = 0; asm ("push %5\n\t" "popf\n\t" - stringify(OP) "q %3\n\t" + stringify(OP) "q %3\n\t" "pushf\n\t" "pop %1\n\t" : "=a" (res), "=g" (flags), "=d" (resh) |