uint32_t instead of int64_t as return type for GetMemorySegmentByteOffset #2432
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…fset and minor fixes
tlively
reviewed
Nov 13, 2019
test/example/c-api-kitchen-sink.c
Outdated
| @@ -1033,28 +1033,24 @@ void test_for_each() { | |||
| assert(BinaryenGetExportByIndex(module, i) == exps[i]); | |||
| } | |||
|
|
|||
| BinaryenAddGlobal(module, "a-global", BinaryenTypeInt32(), 0, makeInt32(module, 125)); | |||
| const int32_t expected_offsets[] = { 10, 125 }; | |||
There was a problem hiding this comment.
Suggested change
| const int32_t expected_offsets[] = { 10, 125 }; | |
| const uint32_t expected_offsets[] = { 10, 125 }; |
There was a problem hiding this comment.
It might be more readable to group all the static data about the segments here at the top instead of mixing it in with binaryen API calls.
test/example/c-api-kitchen-sink.c
Outdated
|
|
||
| const char* segments[] = { "hello, world", "segment data 2" }; | ||
| int8_t segmentPassive[] = { 0, 0 }; | ||
| BinaryenExpressionRef segmentOffsets[] = { | ||
| BinaryenConst(module, BinaryenLiteralInt32(10)), | ||
| BinaryenConst(module, BinaryenLiteralInt32(expected_offsets[0])), | ||
| BinaryenGlobalGet(module, "a-global", BinaryenTypeInt32()) | ||
| }; | ||
| BinaryenIndex segmentSizes[] = { 12, 14 }; | ||
| BinaryenSetMemory(module, 1, 256, "mem", segments, segmentPassive, segmentOffsets, segmentSizes, 2, 0); | ||
|
|
||
| for (i = 0; i < BinaryenGetNumMemorySegments(module) ; i++) { | ||
| char out[15] = {0}; |
There was a problem hiding this comment.
Suggested change
| char out[15] = {0}; | |
| char out[15] = {}; |
test/example/c-api-kitchen-sink.c
Outdated
| BinaryenGlobalGet(module, "a-global", BinaryenTypeInt32()) | ||
| }; | ||
| BinaryenIndex segmentSizes[] = { 12, 14 }; | ||
| BinaryenSetMemory(module, 1, 256, "mem", segments, segmentPassive, segmentOffsets, segmentSizes, 2, 0); | ||
|
|
||
| for (i = 0; i < BinaryenGetNumMemorySegments(module) ; i++) { | ||
| char out[15] = {0}; | ||
| assert(BinaryenGetMemorySegmentByteOffset(module, i) == (0==i?10:125)); | ||
| assert(BinaryenGetMemorySegmentByteOffset(module, i) == expected_offsets[i]); | ||
| assert(BinaryenGetMemorySegmentByteLength(module, i) == segmentSizes[i]); | ||
| BinaryenCopyMemorySegmentData(module, i, &out[0]); |
There was a problem hiding this comment.
Suggested change
| BinaryenCopyMemorySegmentData(module, i, &out[0]); | |
| BinaryenCopyMemorySegmentData(module, i, out); |
test/example/c-api-kitchen-sink.c
Outdated
| else { | ||
| assert(0 == strcmp("segment data 2", &out[0])); | ||
| } | ||
| assert(0 == strcmp(segments[i], &out[0])); |
There was a problem hiding this comment.
Suggested change
| assert(0 == strcmp(segments[i], &out[0])); | |
| assert(0 == strcmp(segments[i], out)); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
and minor test fixes