Changeset b2de426 in rtems

Timestamp:

Aug 6, 2018, 9:53:42 AM (3 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, master

Children:

0fc87d47

Parents:

66cb142

git-author:

Sebastian Huber <sebastian.huber@…> (08/06/18 09:53:42)

git-committer:

Sebastian Huber <sebastian.huber@…> (08/10/18 05:14:43)

Message:

score: Fix _Addresses_Subtract()

Use architecture-specific integer type for an address difference.

Update #3486.

Location:

cpukit

Files:

• include/rtems/rtems/partimpl.h (modified) (1 diff)
• include/rtems/score/address.h (modified) (2 diffs)
• rtems/src/dpmemexternal2internal.c (modified) (2 diffs)
• rtems/src/dpmeminternal2external.c (modified) (2 diffs)

cpukit/include/rtems/rtems/partimpl.h

@@ -78 +78 @@
 )
 {
-  uint32_t     offset;
-
-  offset = (uint32_t) _Addresses_Subtract(
+  intptr_t offset;
+
+  offset = _Addresses_Subtract(
     the_buffer,
     the_partition->starting_address

cpukit/include/rtems/score/address.h

@@ -78 +78 @@
 
 /**
- * @brief Subtract two offsets.
+ * @brief Subtract two addresses.
  *
  * This function is used to subtract two addresses.  It returns the
@@ -87 +87 @@
  *
  * @return This method returns the resulting address.
- *
- * @note  The cast of an address to an uint32_t makes this code
- *        dependent on an addresses being thirty two bits.
  */
-RTEMS_INLINE_ROUTINE int32_t _Addresses_Subtract (
+RTEMS_INLINE_ROUTINE intptr_t _Addresses_Subtract(
   const void *left,
   const void *right
 )
 {
-  return (int32_t) ((const char *) left - (const char *) right);
+  return (intptr_t) ( (const char *) left - (const char *) right );
 }
 

cpukit/rtems/src/dpmemexternal2internal.c

@@ -30 +30 @@
   Dual_ported_memory_Control *the_port;
   ISR_lock_Context            lock_context;
-  uint32_t                    ending;
+  uintptr_t                   length;
 
   if ( internal == NULL ) {
@@ -42 +42 @@
   }
 
-  ending = _Addresses_Subtract( external, the_port->external_base );
+  length = (uintptr_t) _Addresses_Subtract( external, the_port->external_base );
 
-  if ( ending > the_port->length ) {
+  if ( length > the_port->length ) {
     *internal = external;
   } else {
-    *internal = _Addresses_Add_offset( the_port->internal_base, ending );
+    *internal = _Addresses_Add_offset( the_port->internal_base, length );
   }
 

cpukit/rtems/src/dpmeminternal2external.c

@@ -30 +30 @@
   Dual_ported_memory_Control *the_port;
   ISR_lock_Context            lock_context;
-  uint32_t                    ending;
+  uintptr_t                   length;
 
   if ( external == NULL ) {
@@ -42 +42 @@
   }
 
-  ending = _Addresses_Subtract( internal, the_port->internal_base );
+  length = (uintptr_t) _Addresses_Subtract( internal, the_port->internal_base );
 
-  if ( ending > the_port->length ) {
+  if ( length > the_port->length ) {
     *external = internal;
   } else {
-    *external = _Addresses_Add_offset( the_port->external_base, ending );
+    *external = _Addresses_Add_offset( the_port->external_base, length );
   }