combine interpreter checkpoint #85
There are no files selected for viewing
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| fef8844a306d83eef9c30828986645f2b0ff149654490b0f7d47ec2883bcb693 downloads/machine-emulator-tests-data.deb | ||
| bc7a0cc14724167c2826967eaf62feb6a2c902b2b45a73f3c684e1c5ceaa8f69 downloads/uarch-riscv-tests-json-logs.tar.gz |
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| // Copyright Cartesi and individual authors (see AUTHORS) | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| /// @title AdvanceStatus | ||
| /// @notice Return advance status | ||
|
|
||
| pragma solidity ^0.8.0; | ||
|
|
||
| import "./EmulatorCompat.sol"; | ||
| import "./EmulatorConstants.sol"; | ||
|
|
||
| library AdvanceStatus { | ||
| enum Status { | ||
| NOT_YIELDED, | ||
| ACCEPTED, | ||
| REJECTED, | ||
| EXCEPTION | ||
| } | ||
|
|
||
| /* | ||
| typedef struct cmt_io_yield { | ||
| uint8_t dev; | ||
| uint8_t cmd; | ||
| uint16_t reason; | ||
| uint32_t data; | ||
| } cmt_io_yield_t; | ||
| */ | ||
|
|
||
| error InvalidReason(uint16 reason); | ||
|
|
||
| function advanceStatus(AccessLogs.Context memory a) | ||
| internal | ||
| pure | ||
| returns (Status) | ||
| { | ||
| if (!EmulatorCompat.readIflagsY(a)) { | ||
| return Status.NOT_YIELDED; | ||
| } | ||
|
edubart marked this conversation as resolved.
|
||
|
|
||
| // the following two approaches are equivalent: | ||
| // 1. swap the whole struct and then extract the reason | ||
| // 2. extract the reason from the struct and then swap the value | ||
| // EmulatorCompat.readWord already swaps the struct, so we can extract the reason directly | ||
|
|
||
| uint64 tohost = | ||
| EmulatorCompat.readWord(a, EmulatorConstants.HTIF_TOHOST_ADDRESS); | ||
| uint16 reason = uint16(tohost >> 32); | ||
|
edubart marked this conversation as resolved.
Collaborator
There was a problem hiding this comment. This hardcoded |
||
|
|
||
| if (reason == EmulatorConstants.CMIO_YIELD_MANUAL_REASON_RX_ACCEPTED) { | ||
| return Status.ACCEPTED; | ||
| } else if ( | ||
| reason == EmulatorConstants.CMIO_YIELD_MANUAL_REASON_RX_REJECTED | ||
| ) { | ||
| return Status.REJECTED; | ||
| } else if ( | ||
| reason == EmulatorConstants.CMIO_YIELD_MANUAL_REASON_TX_EXCEPTION | ||
| ) { | ||
| return Status.EXCEPTION; | ||
| } else { | ||
| revert InvalidReason(reason); | ||
| } | ||
| } | ||
| } | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,8 +20,28 @@ import "./AccessLogs.sol"; | |
|
|
||
| library EmulatorCompat { | ||
| using AccessLogs for AccessLogs.Context; | ||
| using Buffer for Buffer.Context; | ||
| using Memory for uint64; | ||
|
|
||
| function getCheckpointHash(AccessLogs.Context memory a) | ||
|
Collaborator
There was a problem hiding this comment. Personally I don't like how both
Contributor
There was a problem hiding this comment. I think these should be renamed to RevertRootHash to match the emulator.
Contributor
There was a problem hiding this comment. @stephenctw can we rename this to match the emulator naming convention? I think revert root hash is much more informative than checkpoint hash.
Collaborator
There was a problem hiding this comment. This is being renamed by #88 which we will be merged after merging this PR first. |
||
| internal | ||
| pure | ||
| returns (bytes32) | ||
| { | ||
| bytes32 checkpointHash = a.buffer.consumeBytes32(); | ||
| bytes32 hashOfCheckpointHash = a.readLeaf( | ||
| Memory.strideFromLeafAddress( | ||
| EmulatorConstants.REVERT_ROOT_HASH_ADDRESS.toPhysicalAddress() | ||
| ) | ||
| ); | ||
| require( | ||
| keccak256(abi.encodePacked(checkpointHash)) == hashOfCheckpointHash, | ||
| "checkpoint hash mismatch" | ||
| ); | ||
|
|
||
|
mpernambuco marked this conversation as resolved.
|
||
| return checkpointHash; | ||
| } | ||
|
|
||
| function readCycle(AccessLogs.Context memory a) | ||
| internal | ||
| pure | ||
|
|
@@ -35,12 +55,19 @@ library EmulatorCompat { | |
| function readHaltFlag(AccessLogs.Context memory a) | ||
| internal | ||
| pure | ||
| returns (uint64) | ||
| { | ||
| return a.readWord( | ||
| EmulatorConstants.UARCH_HALT_FLAG_ADDRESS.toPhysicalAddress() | ||
| ); | ||
| } | ||
|
|
||
| function writeHaltFlag(AccessLogs.Context memory a, uint64 val) | ||
| internal | ||
| pure | ||
| { | ||
| a.writeWord( | ||
| EmulatorConstants.UARCH_HALT_FLAG_ADDRESS.toPhysicalAddress(), val | ||
| ); | ||
| } | ||
|
|
||
|
|
@@ -82,9 +109,15 @@ library EmulatorCompat { | |
| ); | ||
| } | ||
|
|
||
| function setCheckpointHash( | ||
| AccessLogs.Context memory a, | ||
| bytes32 checkpointHash | ||
| ) internal pure { | ||
| a.writeLeaf( | ||
| Memory.strideFromLeafAddress( | ||
| EmulatorConstants.REVERT_ROOT_HASH_ADDRESS.toPhysicalAddress() | ||
| ), | ||
| keccak256(abi.encodePacked(checkpointHash)) | ||
| ); | ||
| } | ||
|
|
||
|
|
@@ -280,7 +313,40 @@ library EmulatorCompat { | |
| revert(text); | ||
| } | ||
|
|
||
| function putCharECALL(AccessLogs.Context memory a, uint8 c) internal pure {} | ||
|
|
||
| function markDirtyPageECALL( | ||
| AccessLogs.Context memory a, | ||
| uint64 paddr, | ||
| uint64 pma_index | ||
| ) internal pure {} | ||
|
|
||
| function writeTlbECALL( | ||
| AccessLogs.Context memory a, | ||
| uint64 setIndex, | ||
| uint64 slotIndex, | ||
| uint64 vaddrPage, | ||
| uint64 vpOffset, | ||
| uint64 pmaIndex | ||
| ) internal pure { | ||
|
mpernambuco marked this conversation as resolved.
|
||
| // compute physical address of the TLB slot | ||
| uint64 paddress = EmulatorConstants.AR_SHADOW_TLB_START | ||
| + (setIndex * EmulatorConstants.TLB_SET_LENGTH) | ||
| + (slotIndex * EmulatorConstants.TLB_SLOT_LENGTH); | ||
|
|
||
|
mpernambuco marked this conversation as resolved.
|
||
| // compute stride from physical address (stride = address / leaf_size) | ||
| Memory.Stride writeStride = | ||
| Memory.strideFromLeafAddress(paddress.toPhysicalAddress()); | ||
|
|
||
| // write the 4 words | ||
| a.write4Words( | ||
| writeStride, | ||
| vaddrPage, | ||
| vpOffset, | ||
| pmaIndex, | ||
| 0 // zero_padding_ | ||
| ); | ||
| } | ||
|
|
||
| function uint32Log2(uint32 value) internal pure returns (uint32) { | ||
| require(value > 0, "EmulatorCompat: log2(0) is undefined"); | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Personally I don't like how this
advanceStatuswas introduced in the repository without being used or tests, however I assume Dave is testing it somehow, so we don't need to delay this PR.