Changeset 096c0786 in mainline for kernel/generic/include/align.h

Timestamp:

2024-09-16T11:54:47Z (2 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

master

Children:

1bbc6dc

Parents:

bec6379

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2024-09-15 18:51:13)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2024-09-16 11:54:47)

Message:

Ensure ALIGN_UP/DOWN() work with any size arguments

File:

• kernel/generic/include/align.h (modified) (3 diffs)

kernel/generic/include/align.h

@@ -39 +39 @@
 #define KERN_ALIGN_H_
 
+#ifdef __ASSEMBLER__
+#define ALIGN_DOWN(s, a)  ((s) & ~((a) - 1))
+#define ALIGN_UP(s, a)    (((s) + ((a) - 1)) & ~((a) - 1))
+#else
+
 /** Align to the nearest lower address.
  *
@@ -44 +49 @@
  * @param a Size of alignment, must be a power of 2.
  */
-#define ALIGN_DOWN(s, a)  ((s) & ~((a) - 1))
+#define ALIGN_DOWN(s, a)  ((s) & ~((typeof(s))(a) - 1))
 
 /** Align to the nearest higher address.
@@ -51 +56 @@
  * @param a Size of alignment, must be a power of 2.
  */
-#define ALIGN_UP(s, a)  (((s) + ((a) - 1)) & ~((a) - 1))
+#define ALIGN_UP(s, a)  (((s) + ((a) - 1)) & ~((typeof(s))(a) - 1))
+
+#endif
 
 /** Check alignment.