Changeset 43 for abuse/trunkTweet

Timestamp:

Mar 2, 2008, 1:58:48 AM (14 years ago)

Author:

Sam Hocevar

Message:

• Fix argument types in lisp_cos(), lisp_sin() and lisp_atan() to avoid overflows. Closes #1 #2 #3.

Location:

abuse/trunk/src

Files:

• calctrig.cpp (modified) (2 diffs)
• include/lisp.hpp (modified) (2 diffs)
• include/lisp2.hpp (modified) (2 diffs)
• lisp.cpp (modified) (11 diffs)
• trig.cpp (modified) (2 diffs)

abuse/trunk/src/calctrig.cpp

@@ -4 +4 @@
 {
   int i,x;
-  printf("long sin_table[360]={\n  ");
+  printf("int32_t sin_table[360]={\n  ");
   for (i=0;i<360;i++)
   {
@@ -13 +13 @@
   printf("};\n");
 
-  printf("unsigned short atan_table[1662]={\n  ");
+  printf("uint16_t atan_table[1662]={\n  ");
  
   for (i=1;i<1662;i++)

abuse/trunk/src/include/lisp.hpp

@@ -21 +21 @@
 
 #define FIXED_TRIG_SIZE 360               // 360 degrees stored in table
-extern long sin_table[FIXED_TRIG_SIZE];   // this should be filled in by external module
+extern int32_t sin_table[FIXED_TRIG_SIZE];   // this should be filled in by external module
 #define TBS 1662                          // atan table granularity
-extern unsigned short atan_table[TBS];
+extern uint16_t atan_table[TBS];
 #define NILP(x) (x==NULL)
 #define DEFINEDP(x) (x!=l_undefined)
@@ -197 +197 @@
 extern int space_size[4];
 void *nth(int num, void *list);
-long lisp_atan2(long dy, long dx);
-long lisp_sin(long x);
-long lisp_cos(long x);
+int32_t lisp_atan2(int32_t dy, int32_t dx);
+int32_t lisp_sin(int32_t x);
+int32_t lisp_cos(int32_t x);
 void restore_heap(void *val, int heap);
 void *mark_heap(int heap);

abuse/trunk/src/include/lisp2.hpp

@@ -62 +62 @@
 
 #define FIXED_TRIG_SIZE 360               // 360 degrees stored in table
-extern long sin_table[FIXED_TRIG_SIZE];   // this should be filled in by external module
+extern int32_t sin_table[FIXED_TRIG_SIZE];   // this should be filled in by external module
 #define TBS 1662                          // atan table granularity
-extern unsigned short atan_table[TBS];
+extern uint16_t atan_table[TBS];
 
 /* ------------------------- COMPATIBILITY -------------------- */
@@ -111 +111 @@
 char* symbol_name (void* symbol);
 int item_type (void* cell);
-long lisp_cos(long x);
-long lisp_sin(long x);
-long lisp_atan2(long dy, long dx);
+int32_t lisp_cos(int32_t x);
+int32_t lisp_sin(int32_t x);
+int32_t lisp_atan2(int32_t dy, int32_t dx);
 void push_onto_list(Cell *object, Cell *&list);
 

abuse/trunk/src/lisp.cpp

@@ -677 +677 @@
 }
 
-long lisp_cos(long x)
+int32_t lisp_cos(int32_t x)
 {
   x=(x+FIXED_TRIG_SIZE/4)%FIXED_TRIG_SIZE;
@@ -684 +684 @@
 }
 
-long lisp_sin(long x)
+int32_t lisp_sin(int32_t x)
 {
   x=x%FIXED_TRIG_SIZE;
@@ -691 +691 @@
 }
 
-long lisp_atan2(long dy, long dx)
+int32_t lisp_atan2(int32_t dy, int32_t dx)
 {
   if (dy==0)
@@ -709 +709 @@
         if (abs(dx)>abs(dy))
         {
-          long a=dx*29/dy;
+          int32_t a=dx*29/dy;
           if (a>=TBS) return 0;
           else return 45-atan_table[a];
@@ -715 +715 @@
         else 
         {
-          long a=dy*29/dx;
+          int32_t a=dy*29/dx;
           if (a>=TBS) return 90;
           else return 45+atan_table[a];
@@ -723 +723 @@
         if (abs(dx)>abs(dy))
         {
-          long a=dx*29/abs(dy);
+          int32_t a=dx*29/abs(dy);
           if (a>=TBS)
             return 0;
@@ -731 +731 @@
         else
         {
-          long a=abs(dy)*29/dx;
+          int32_t a=abs(dy)*29/dx;
           if (a>=TBS)
             return 260;
@@ -744 +744 @@
         if (abs(dx)>abs(dy))
         {
-          long a=-dx*29/dy;
+          int32_t a=-dx*29/dy;
           if (a>=TBS)
             return 135+45;
@@ -752 +752 @@
         else 
         {
-          long a=dy*29/-dx;
+          int32_t a=dy*29/-dx;
           if (a>=TBS)
             return 135-45;
@@ -762 +762 @@
         if (abs(dx)>abs(dy))
         {
-          long a=-dx*29/abs(dy);
+          int32_t a=-dx*29/abs(dy);
           if (a>=TBS)
             return 225-45;
@@ -769 +769 @@
         else 
         {
-          long a=abs(dy)*29/abs(dx);
+          int32_t a=abs(dy)*29/abs(dx);
           if (a>=TBS)
             return 225+45;        

abuse/trunk/src/trig.cpp

@@ -1 @@
-long sin_table[360]={
+#include "system.h"
+
+int32_t sin_table[360]={
   0x00000000, 0x00000477, 0x000008ef, 0x00000d65, 0x000011db, 0x0000164f, 
   0x00001ac2, 0x00001f32, 0x000023a0, 0x0000280c, 0x00002c74, 0x000030d8, 
@@ -61 +63 @@
   0xffffe53e, 0xffffe9b1, 0xffffee25, 0xfffff29b, 0xfffff711, 0xfffffb89
   };
-unsigned short atan_table[1662]={
+uint16_t atan_table[1662]={
     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 
     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,