sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add opcode flag: permissive bounds

Browse source
This commit is contained in:
Jean Pierre Cimalando 2021-03-19 14:16:49 +01:00
parent d4bbe806be
commit 8672a5b5f7
2 changed files with 23 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/sfizz/Defaults.h
View file

@ -51,11 +51,12 @@ enum OpcodeFlags : int {
kEnforceLowerBound = 1 << 1, kEnforceLowerBound = 1 << 1,
kEnforceUpperBound = 1 << 2, kEnforceUpperBound = 1 << 2,
kEnforceBounds = kEnforceLowerBound|kEnforceUpperBound, kEnforceBounds = kEnforceLowerBound|kEnforceUpperBound,
kNormalizePercent = 1 << 3, kPermissiveBounds = 1 << 3,
kNormalizeMidi = 1 << 4, kNormalizePercent = 1 << 4,
kNormalizeBend = 1 << 5, kNormalizeMidi = 1 << 5,
kWrapPhase = 1 << 6, kNormalizeBend = 1 << 6,
kDb2Mag = 1 << 7, kWrapPhase = 1 << 7,
kDb2Mag = 1 << 8,
}; };
template<class T> template<class T>

18
src/sfizz/Opcode.cpp
View file

@ -11,6 +11,7 @@
#include "absl/strings/ascii.h" #include "absl/strings/ascii.h"
#include "absl/strings/match.h" #include "absl/strings/match.h"
#include "absl/strings/str_cat.h" #include "absl/strings/str_cat.h"
#include <limits>
#include <iostream> #include <iostream>
#include <cctype> #include <cctype>
#include <cassert> #include <cassert>
@ -144,6 +145,8 @@ OpcodeCategory Opcode::identifyCategory(absl::string_view name)
template <typename T> template <typename T>
absl::optional<T> readInt_(OpcodeSpec<T> spec, absl::string_view v) absl::optional<T> readInt_(OpcodeSpec<T> spec, absl::string_view v)
{ {
using Limits = std::numeric_limits<T>;
size_t numberEnd = 0; size_t numberEnd = 0;
if (numberEnd < v.size() && (v[numberEnd] == '+' || v[numberEnd] == '-')) if (numberEnd < v.size() && (v[numberEnd] == '+' || v[numberEnd] == '-'))
@ -164,15 +167,18 @@ absl::optional<T> readInt_(OpcodeSpec<T> spec, absl::string_view v)
if (returnedValue > static_cast<int64_t>(spec.bounds.getEnd())) { if (returnedValue > static_cast<int64_t>(spec.bounds.getEnd())) {
if (spec.flags & kEnforceUpperBound) if (spec.flags & kEnforceUpperBound)
return spec.bounds.getEnd(); return spec.bounds.getEnd();
else if (!(spec.flags & kPermissiveBounds))
return absl::nullopt; return absl::nullopt;
} else if (returnedValue < static_cast<int64_t>(spec.bounds.getStart())) { } else if (returnedValue < static_cast<int64_t>(spec.bounds.getStart())) {
if (spec.flags & kEnforceLowerBound) if (spec.flags & kEnforceLowerBound)
return spec.bounds.getStart(); return spec.bounds.getStart();
else if (!(spec.flags & kPermissiveBounds))
return absl::nullopt; return absl::nullopt;
} }
returnedValue = std::max<int64_t>(returnedValue, Limits::min());
returnedValue = std::min<int64_t>(returnedValue, Limits::max());
return static_cast<T>(returnedValue); return static_cast<T>(returnedValue);
} }
@ -219,16 +225,18 @@ absl::optional<T> readFloat_(OpcodeSpec<T> spec, absl::string_view v)
else if (returnedValue > static_cast<int64_t>(spec.bounds.getEnd())) { else if (returnedValue > static_cast<int64_t>(spec.bounds.getEnd())) {
if (spec.flags & kEnforceUpperBound) if (spec.flags & kEnforceUpperBound)
return spec.bounds.getEnd(); return spec.bounds.getEnd();
else if (!(spec.flags & kPermissiveBounds))
return absl::nullopt; return absl::nullopt;
} else if (returnedValue < static_cast<int64_t>(spec.bounds.getStart())) { } else if (returnedValue < static_cast<int64_t>(spec.bounds.getStart())) {
if (spec.flags & kEnforceLowerBound) if (spec.flags & kEnforceLowerBound)
return spec.bounds.getStart(); return spec.bounds.getStart();
else if (!(spec.flags & kPermissiveBounds))
return absl::nullopt; return absl::nullopt;
} }
return spec.normalizeInput(returnedValue); returnedValue = spec.normalizeInput(returnedValue);
return returnedValue;
} }
#define INSTANTIATE_FOR_FLOATING_POINT(T) \ #define INSTANTIATE_FOR_FLOATING_POINT(T) \