From Fredrik Holmqvist <fredrik.holmqvist@xxxxxxxxx>:
Fredrik Holmqvist has uploaded this change for review. (
https://review.haiku-os.org/c/haiku/+/5394 ;)
Change subject: movement_maker: use real math
......................................................................
movement_maker: use real math
Not sure if linking is correct.
It compiles and boots but untested as I use USB input
---
M src/add-ons/kernel/bus_managers/ps2/Jamfile
M src/add-ons/kernel/bus_managers/ps2/movement_maker.cpp
M src/add-ons/kernel/bus_managers/ps2/movement_maker.h
3 files changed, 4 insertions(+), 164 deletions(-)
git pull ssh://git.haiku-os.org:22/haiku refs/changes/94/5394/1
diff --git a/src/add-ons/kernel/bus_managers/ps2/Jamfile
b/src/add-ons/kernel/bus_managers/ps2/Jamfile
index c5d6817..8653eec 100644
--- a/src/add-ons/kernel/bus_managers/ps2/Jamfile
+++ b/src/add-ons/kernel/bus_managers/ps2/Jamfile
@@ -16,4 +16,5 @@
ps2_trackpoint.cpp
ps2_service.cpp
movement_maker.cpp
+ : root
;
diff --git a/src/add-ons/kernel/bus_managers/ps2/movement_maker.cpp
b/src/add-ons/kernel/bus_managers/ps2/movement_maker.cpp
index 366a7be..7f9a9cb 100644
--- a/src/add-ons/kernel/bus_managers/ps2/movement_maker.cpp
+++ b/src/add-ons/kernel/bus_managers/ps2/movement_maker.cpp
@@ -1,5 +1,6 @@
#include "movement_maker.h"
+#include <math.h>
#include <stdlib.h>
#include <KernelExport.h>
@@ -13,162 +14,6 @@
#endif
-typedef union {
- float value;
- /* FIXME: Assumes 32 bit int. */
- unsigned int word;
-} ieee_float_shape_type;
-
-/* Get a 32 bit int from a float. */
-
-#define GET_FLOAT_WORD(i,d) \
-do { \
- ieee_float_shape_type gf_u; \
- gf_u.value = (d); \
- (i) = gf_u.word; \
-} while (0)
-
-/* Set a float from a 32 bit int. */
-
-#define SET_FLOAT_WORD(d,i) \
-do { \
- ieee_float_shape_type sf_u; \
- sf_u.word = (i); \
- (d) = sf_u.value; \
-} while (0)
-
-static const float huge = 1.0e30;
-
-float
-floorf(float x)
-{
- int32 i0,j0;
- uint32 i;
- GET_FLOAT_WORD(i0,x);
- j0 = ((i0>>23)&0xff)-0x7f;
- if (j0<23) {
- if (j0<0) { /* raise inexact if x != 0 */
- if (huge+x>(float)0.0) {/* return 0*sign(x) if |x|<1 */
- if (i0>=0) {i0=0;}
- else if ((i0&0x7fffffff)!=0)
- { i0=0xbf800000;}
- }
- } else {
- i = (0x007fffff)>>j0;
- if ((i0&i)==0) return x; /* x is integral */
- if (huge+x>(float)0.0) { /* raise inexact flag */
- if (i0<0) i0 += (0x00800000)>>j0;
- i0 &= (~i);
- }
- }
- } else {
- if (j0==0x80) return x+x; /* inf or NaN */
- else return x; /* x is integral */
- }
- SET_FLOAT_WORD(x,i0);
- return x;
-}
-
-
-float
-ceilf(float x)
-{
- int32 i0,j0;
- uint32 i;
-
- GET_FLOAT_WORD(i0,x);
- j0 = ((i0>>23)&0xff)-0x7f;
- if (j0<23) {
- if (j0<0) { /* raise inexact if x != 0 */
- if (huge+x>(float)0.0) {/* return 0*sign(x) if |x|<1 */
- if (i0<0) {i0=0x80000000;}
- else if (i0!=0) { i0=0x3f800000;}
- }
- } else {
- i = (0x007fffff)>>j0;
- if ((i0&i)==0) return x; /* x is integral */
- if (huge+x>(float)0.0) { /* raise inexact flag */
- if (i0>0) i0 += (0x00800000)>>j0;
- i0 &= (~i);
- }
- }
- } else {
- if (j0==0x80) return x+x; /* inf or NaN */
- else return x; /* x is integral */
- }
- SET_FLOAT_WORD(x,i0);
- return x;
-}
-
-static const float one = 1.0, tiny=1.0e-30;
-
-float
-sqrtf(float x)
-{
- float z;
- int32 sign = (int)0x80000000;
- int32 ix,s,q,m,t,i;
- uint32 r;
-
- GET_FLOAT_WORD(ix,x);
-
- /* take care of Inf and NaN */
- if ((ix&0x7f800000)==0x7f800000) {
- return x*x+x; /* sqrt(NaN)=NaN, sqrt(+inf)=+inf
- sqrt(-inf)=sNaN */
- }
- /* take care of zero */
- if (ix<=0) {
- if ((ix&(~sign))==0) return x;/* sqrt(+-0) = +-0 */
- else if (ix<0)
- return (x-x)/(x-x); /* sqrt(-ve) = sNaN */
- }
- /* normalize x */
- m = (ix>>23);
- if (m==0) { /* subnormal x */
- for(i=0;(ix&0x00800000)==0;i++) ix<<=1;
- m -= i-1;
- }
- m -= 127; /* unbias exponent */
- ix = (ix&0x007fffff)|0x00800000;
- if (m&1) /* odd m, double x to make it even */
- ix += ix;
- m >>= 1; /* m = [m/2] */
-
- /* generate sqrt(x) bit by bit */
- ix += ix;
- q = s = 0; /* q = sqrt(x) */
- r = 0x01000000; /* r = moving bit from right to left */
-
- while(r!=0) {
- t = s+r;
- if (t<=ix) {
- s = t+r;
- ix -= t;
- q += r;
- }
- ix += ix;
- r>>=1;
- }
-
- /* use floating add to find out rounding direction */
- if (ix!=0) {
- z = one-tiny; /* trigger inexact flag */
- if (z>=one) {
- z = one+tiny;
- if (z>one)
- q += 2;
- else
- q += (q&1);
- }
- }
- ix = (q>>1)+0x3f000000;
- ix += (m <<23);
- SET_FLOAT_WORD(z,ix);
- return z;
-}
-
-
static int32
make_small(float value)
{
@@ -179,7 +24,6 @@
}
-
void
MovementMaker::SetSettings(touchpad_settings* settings)
{
diff --git a/src/add-ons/kernel/bus_managers/ps2/movement_maker.h
b/src/add-ons/kernel/bus_managers/ps2/movement_maker.h
index 5375f78..23ceca5 100644
--- a/src/add-ons/kernel/bus_managers/ps2/movement_maker.h
+++ b/src/add-ons/kernel/bus_managers/ps2/movement_maker.h
@@ -7,11 +7,6 @@
#include <touchpad_settings.h>
-float floorf(float x);
-float ceilf(float x);
-float sqrtf(float x);
-
-
struct touch_event {
uint8 buttons;
uint32 xPosition;
@@ -62,7 +57,7 @@
float scrolling_x;
float scrolling_y;
-
+
protected:
void StartNewMovment();
void GetMovement(uint32
posX, uint32 posY);
@@ -79,7 +74,7 @@
void _GetRawMovement(uint32
posX, uint32 posY);
void
_ComputeAcceleration(int8 accel_factor);
-
+
bool fMovementMakerStarted;
uint32 fPreviousX;
--
To view, visit https://review.haiku-os.org/c/haiku/+/5394
To unsubscribe, or for help writing mail filters, visit
https://review.haiku-os.org/settings
Gerrit-Project: haiku
Gerrit-Branch: master
Gerrit-Change-Id: Ia108041b69d3c8b13233d63b97ba0b9bee67d336
Gerrit-Change-Number: 5394
Gerrit-PatchSet: 1
Gerrit-Owner: Fredrik Holmqvist <fredrik.holmqvist@xxxxxxxxx>
Gerrit-MessageType: newchange
