<div dir="auto">Should this have a ticket and be applied to 5 also? There are other 64 bit architectures but they don't get tested as often and thoroughly.</div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, Feb 15, 2021, 9:12 AM Kinsey Moore <<a href="mailto:kinsey.moore@oarcorp.com">kinsey.moore@oarcorp.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From: ryan long <rlong@localhost.localdomain><br>
<br>
The ts-validation-0 test currently fails on 64bit BSPs due to a<br>
limitation of the message structure. Changing the max message size to a<br>
size_t type and adjusting the expected value in the test resolves this.<br>
<br>
Closes #4179.<br>
---<br>
cpukit/include/rtems/rtems/message.h | 2 +-<br>
cpukit/include/rtems/score/coremsgimpl.h | 2 +-<br>
cpukit/score/src/coremsg.c | 2 +-<br>
spec/build/bsps/aarch64/a53/tsta53.yml | 3 ---<br>
spec/build/bsps/aarch64/xilinx-zynqmp/tstqemu.yml | 3 ---<br>
testsuites/validation/tc-message-construct-errors.c | 2 +-<br>
6 files changed, 4 insertions(+), 10 deletions(-)<br>
<br>
diff --git a/cpukit/include/rtems/rtems/message.h b/cpukit/include/rtems/rtems/message.h<br>
index 14083b8cd0..7bb48ba35a 100644<br>
--- a/cpukit/include/rtems/rtems/message.h<br>
+++ b/cpukit/include/rtems/rtems/message.h<br>
@@ -51,7 +51,7 @@ typedef struct {<br>
* @brief This member defines the maximum number of pending messages supported<br>
* by the message queue.<br>
*/<br>
- uint32_t maximum_pending_messages;<br>
+ size_t maximum_pending_messages;<br>
<br>
/**<br>
* @brief This member defines the maximum message size supported by the message<br>
diff --git a/cpukit/include/rtems/score/coremsgimpl.h b/cpukit/include/rtems/score/coremsgimpl.h<br>
index 6f6a01bea6..c7a424c08c 100644<br>
--- a/cpukit/include/rtems/score/coremsgimpl.h<br>
+++ b/cpukit/include/rtems/score/coremsgimpl.h<br>
@@ -144,7 +144,7 @@ void *_CORE_message_queue_Workspace_allocate(<br>
Status_Control _CORE_message_queue_Initialize(<br>
CORE_message_queue_Control *the_message_queue,<br>
CORE_message_queue_Disciplines discipline,<br>
- uint32_t maximum_pending_messages,<br>
+ size_t maximum_pending_messages,<br>
size_t maximum_message_size,<br>
CORE_message_queue_Allocate_buffers allocate_buffers,<br>
const void *arg<br>
diff --git a/cpukit/score/src/coremsg.c b/cpukit/score/src/coremsg.c<br>
index cf7f44ed17..530f05719a 100644<br>
--- a/cpukit/score/src/coremsg.c<br>
+++ b/cpukit/score/src/coremsg.c<br>
@@ -35,7 +35,7 @@ RTEMS_STATIC_ASSERT(<br>
Status_Control _CORE_message_queue_Initialize(<br>
CORE_message_queue_Control *the_message_queue,<br>
CORE_message_queue_Disciplines discipline,<br>
- uint32_t maximum_pending_messages,<br>
+ size_t maximum_pending_messages,<br>
size_t maximum_message_size,<br>
CORE_message_queue_Allocate_buffers allocate_buffers,<br>
const void *arg<br>
diff --git a/spec/build/bsps/aarch64/a53/tsta53.yml b/spec/build/bsps/aarch64/a53/tsta53.yml<br>
index 9135fac7f4..4ecef03641 100644<br>
--- a/spec/build/bsps/aarch64/a53/tsta53.yml<br>
+++ b/spec/build/bsps/aarch64/a53/tsta53.yml<br>
@@ -4,9 +4,6 @@ actions:<br>
# expected to fail, don't compile these<br>
minimum: exclude<br>
<br>
- # test broken under 64bit due to SIZE_MAX differences<br>
- validation-0: exclude<br>
-<br>
# don't compile due to toolchain issues<br>
spconfig01: exclude<br>
spmisc01: exclude<br>
diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/tstqemu.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/tstqemu.yml<br>
index d0efba65cd..45fdc503aa 100644<br>
--- a/spec/build/bsps/aarch64/xilinx-zynqmp/tstqemu.yml<br>
+++ b/spec/build/bsps/aarch64/xilinx-zynqmp/tstqemu.yml<br>
@@ -4,9 +4,6 @@ actions:<br>
# expected to fail<br>
minimum: exclude<br>
<br>
- # test broken under 64bit due to SIZE_MAX differences<br>
- validation-0: expected-fail<br>
-<br>
# don't compile due to toolchain issues<br>
spconfig01: exclude<br>
spmisc01: exclude<br>
diff --git a/testsuites/validation/tc-message-construct-errors.c b/testsuites/validation/tc-message-construct-errors.c<br>
index 5820855ac4..903ff534fa 100644<br>
--- a/testsuites/validation/tc-message-construct-errors.c<br>
+++ b/testsuites/validation/tc-message-construct-errors.c<br>
@@ -278,7 +278,7 @@ static void RtemsMessageReqConstructErrors_Pre_MaxPending_Prepare(<br>
}<br>
<br>
case RtemsMessageReqConstructErrors_Pre_MaxPending_Big: {<br>
- ctx->config.maximum_pending_messages = UINT32_MAX;<br>
+ ctx->config.maximum_pending_messages = SIZE_MAX;<br>
break;<br>
}<br>
<br>
-- <br>
2.20.1<br>
<br>
_______________________________________________<br>
devel mailing list<br>
<a href="mailto:devel@rtems.org" target="_blank" rel="noreferrer">devel@rtems.org</a><br>
<a href="http://lists.rtems.org/mailman/listinfo/devel" rel="noreferrer noreferrer" target="_blank">http://lists.rtems.org/mailman/listinfo/devel</a><br>
</blockquote></div>