github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2025-06-28 16:41:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add CATCH_UP to report_block, not "parent" program

Browse Source 
Also ensure that exhaustion check happens after catch up, as catch up
may fire reports (which could exhaust).
This commit is contained in:
Justin Viiret 2016-02-15 12:35:03 +11:00 committed by Matthew Barr
parent 1619d975c6
commit 996eba9686
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/rose/rose_build_bytecode.cpp
View File

@ -3035,15 +3035,6 @@ void makeReport(RoseBuildImpl &build, const ReportID id, const bool has_som,
vector<RoseInstruction> report_block; vector<RoseInstruction> report_block;
// If this report has an exhaustion key, we can check it in the program
// rather than waiting until we're in the callback adaptor.
if (report.ekey != INVALID_EKEY) {
auto ri = RoseInstruction(ROSE_INSTR_CHECK_EXHAUSTED,
JumpTarget::NEXT_BLOCK);
ri.u.checkExhausted.ekey = report.ekey;
report_block.push_back(move(ri));
}
// Similarly, we can handle min/max offset checks. // Similarly, we can handle min/max offset checks.
if (report.minOffset > 0 || report.maxOffset < MAX_OFFSET) { if (report.minOffset > 0 || report.maxOffset < MAX_OFFSET) {
auto ri = RoseInstruction(ROSE_INSTR_CHECK_BOUNDS, auto ri = RoseInstruction(ROSE_INSTR_CHECK_BOUNDS,
@ -3057,7 +3048,16 @@ void makeReport(RoseBuildImpl &build, const ReportID id, const bool has_som,
// TODO: this could be floated in front of all the reports and only done // TODO: this could be floated in front of all the reports and only done
// once. // once.
if (report.type != INTERNAL_ROSE_CHAIN) { if (report.type != INTERNAL_ROSE_CHAIN) {
program.emplace_back(ROSE_INSTR_CATCH_UP); report_block.emplace_back(ROSE_INSTR_CATCH_UP);
}
// If this report has an exhaustion key, we can check it in the program
// rather than waiting until we're in the callback adaptor.
if (report.ekey != INVALID_EKEY) {
auto ri = RoseInstruction(ROSE_INSTR_CHECK_EXHAUSTED,
JumpTarget::NEXT_BLOCK);
ri.u.checkExhausted.ekey = report.ekey;
report_block.push_back(move(ri));
} }
// External SOM reports need their SOM value calculated. // External SOM reports need their SOM value calculated.