Changeset 9b2729c in mainline

Timestamp:

2006-02-07T20:22:17Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8b3eebb

Parents:

47c83bc

Message:

Fix number of steps in softint division.
Make ia64 port compile with softint.

Files:

• arch/ia64/Makefile.inc (modified) (1 diff)
• genarch/Makefile.inc (modified) (1 diff)
• genarch/include/softint/division.h (moved) (moved from genarch/include/softint/softint.h ) (1 diff)
• genarch/src/softint/division.c (moved) (moved from genarch/src/softint/softint.c ) (9 diffs)

arch/ia64/Makefile.inc

@@ -54 +54 @@
 CONFIG_ASID_FIFO = y
 
+
+## Compile with support for software integer division.
+#
+
+CONFIG_SOFTINT = y
+
 ARCH_SOURCES = \
         arch/$(ARCH)/src/start.S \

genarch/Makefile.inc

@@ -56 +56 @@
                 genarch/src/mm/asid_fifo.c
 endif
+ifeq ($(CONFIG_SOFTINT),y)
+        GENARCH_SOURCES += \
+                genarch/src/softint/division.c
+endif

genarch/include/softint/division.h

@@ -27 +27 @@
  */
 
-#ifndef __SOFTINT_H__
-#define __SOFTINT_H__
+#ifndef __SOFTINT_DIVISION_H__
+#define __SOFTINT_DIVISION_H__
 
 

genarch/src/softint/division.c

@@ -27 +27 @@
  */
 
-#include <softint/softint.h>
+#include <genarch/softint/division.h>
 
 #define ABSVAL(x) ( (x) > 0 ? (x) : -(x))
@@ -35 +35 @@
 {
         unsigned int result;
-        int steps = sizeof(unsigned int); 
+        int steps = sizeof(unsigned int) * 8; 
         
         *remainder = 0;
@@ -52 +52 @@
         for ( ; steps > 0; steps--) {
                 /* shift one bit to remainder */
-                *remainder = ( (*remainder) << 1) | (( divident >> 31) & 0x1);
+                *remainder = ( (*remainder) << 1) | (( a >> 31) & 0x1);
                 result <<= 1;
                 
@@ -59 +59 @@
                                 result |= 0x1;
                 }
-                divident <<= 1;
+                a <<= 1;
         }
 
@@ -69 +69 @@
 {
         unsigned long result;
-        int steps = sizeof(unsigned long); 
+        int steps = sizeof(unsigned long) * 8; 
         
         *remainder = 0;
@@ -86 +86 @@
         for ( ; steps > 0; steps--) {
                 /* shift one bit to remainder */
-                *remainder = ( (*remainder) << 1) | (( divident >> 63) & 0x1);
+                *remainder = ( (*remainder) << 1) | ((a >> 63) & 0x1);
                 result <<= 1;
                 
@@ -93 +93 @@
                                 result |= 0x1;
                 }
-                divident <<= 1;
+                a <<= 1;
         }
 
@@ -143 +143 @@
         divandmod32(a, b, &rem);
         
-        /* if divident is negative, remainder must be too*/
+        /* if divident is negative, remainder must be too */
         if (!(SGN(a))) {
                 return -((int)rem);
@@ -157 +157 @@
         divandmod64(a, b, &rem);
         
-        /* if divident is negative, remainder must be too*/
+        /* if divident is negative, remainder must be too */
         if (!(SGN(a))) {
                 return -((long)rem);