Skip to content

Commit

Permalink
chore!: rename bigint_neg into bigint_sub (#4420)
Browse files Browse the repository at this point in the history 
Resolves noir issue: noir-lang/noir#4243

The bigint_neg opcode was implemented with a sub, instead of a negate as
the name suggest. The name has simply been changed to sub.
  • Loading branch information
@guipublic @AztecBot
guipublic authored and AztecBot committed Feb 6, 2024
1 parent ce6f451 commit b62f03c
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion cpp/src/barretenberg/dsl/acir_format/acir_to_constraint_buf.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ void handle_blackbox_func_call(Circuit::Opcode::BlackBoxFuncCall const& arg, Aci
.result = arg.output,
.opcode = BigIntOperationType::Add,
});
} else if constexpr (std::is_same_v<T, Circuit::BlackBoxFuncCall::BigIntNeg>) {
} else if constexpr (std::is_same_v<T, Circuit::BlackBoxFuncCall::BigIntSub>) {
af.bigint_operations.push_back(BigIntOperation{
.lhs = arg.lhs,
.rhs = arg.rhs,
Expand Down
50 changes: 25 additions & 25 deletions cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,14 +206,14 @@ struct BlackBoxFuncCall {
static BigIntAdd bincodeDeserialize(std::vector<uint8_t>);
};

struct BigIntNeg {
struct BigIntSub {
uint32_t lhs;
uint32_t rhs;
uint32_t output;

friend bool operator==(const BigIntNeg&, const BigIntNeg&);
friend bool operator==(const BigIntSub&, const BigIntSub&);
std::vector<uint8_t> bincodeSerialize() const;
static BigIntNeg bincodeDeserialize(std::vector<uint8_t>);
static BigIntSub bincodeDeserialize(std::vector<uint8_t>);
};

struct BigIntMul {
Expand Down Expand Up @@ -293,7 +293,7 @@ struct BlackBoxFuncCall {
Keccakf1600,
RecursiveAggregation,
BigIntAdd,
BigIntNeg,
BigIntSub,
BigIntMul,
BigIntDiv,
BigIntFromLeBytes,
Expand Down Expand Up @@ -637,14 +637,14 @@ struct BlackBoxOp {
static BigIntAdd bincodeDeserialize(std::vector<uint8_t>);
};

struct BigIntNeg {
struct BigIntSub {
Circuit::MemoryAddress lhs;
Circuit::MemoryAddress rhs;
Circuit::MemoryAddress output;

friend bool operator==(const BigIntNeg&, const BigIntNeg&);
friend bool operator==(const BigIntSub&, const BigIntSub&);
std::vector<uint8_t> bincodeSerialize() const;
static BigIntNeg bincodeDeserialize(std::vector<uint8_t>);
static BigIntSub bincodeDeserialize(std::vector<uint8_t>);
};

struct BigIntMul {
Expand Down Expand Up @@ -719,7 +719,7 @@ struct BlackBoxOp {
FixedBaseScalarMul,
EmbeddedCurveAdd,
BigIntAdd,
BigIntNeg,
BigIntSub,
BigIntMul,
BigIntDiv,
BigIntFromLeBytes,
Expand Down Expand Up @@ -3071,7 +3071,7 @@ Circuit::BlackBoxFuncCall::BigIntAdd serde::Deserializable<Circuit::BlackBoxFunc

namespace Circuit {

inline bool operator==(const BlackBoxFuncCall::BigIntNeg& lhs, const BlackBoxFuncCall::BigIntNeg& rhs)
inline bool operator==(const BlackBoxFuncCall::BigIntSub& lhs, const BlackBoxFuncCall::BigIntSub& rhs)
{
if (!(lhs.lhs == rhs.lhs)) {
return false;
Expand All @@ -3085,17 +3085,17 @@ inline bool operator==(const BlackBoxFuncCall::BigIntNeg& lhs, const BlackBoxFun
return true;
}

inline std::vector<uint8_t> BlackBoxFuncCall::BigIntNeg::bincodeSerialize() const
inline std::vector<uint8_t> BlackBoxFuncCall::BigIntSub::bincodeSerialize() const
{
auto serializer = serde::BincodeSerializer();
serde::Serializable<BlackBoxFuncCall::BigIntNeg>::serialize(*this, serializer);
serde::Serializable<BlackBoxFuncCall::BigIntSub>::serialize(*this, serializer);
return std::move(serializer).bytes();
}

inline BlackBoxFuncCall::BigIntNeg BlackBoxFuncCall::BigIntNeg::bincodeDeserialize(std::vector<uint8_t> input)
inline BlackBoxFuncCall::BigIntSub BlackBoxFuncCall::BigIntSub::bincodeDeserialize(std::vector<uint8_t> input)
{
auto deserializer = serde::BincodeDeserializer(input);
auto value = serde::Deserializable<BlackBoxFuncCall::BigIntNeg>::deserialize(deserializer);
auto value = serde::Deserializable<BlackBoxFuncCall::BigIntSub>::deserialize(deserializer);
if (deserializer.get_buffer_offset() < input.size()) {
throw_or_abort("Some input bytes were not read");
}
Expand All @@ -3106,8 +3106,8 @@ inline BlackBoxFuncCall::BigIntNeg BlackBoxFuncCall::BigIntNeg::bincodeDeseriali

template <>
template <typename Serializer>
void serde::Serializable<Circuit::BlackBoxFuncCall::BigIntNeg>::serialize(
const Circuit::BlackBoxFuncCall::BigIntNeg& obj, Serializer& serializer)
void serde::Serializable<Circuit::BlackBoxFuncCall::BigIntSub>::serialize(
const Circuit::BlackBoxFuncCall::BigIntSub& obj, Serializer& serializer)
{
serde::Serializable<decltype(obj.lhs)>::serialize(obj.lhs, serializer);
serde::Serializable<decltype(obj.rhs)>::serialize(obj.rhs, serializer);
Expand All @@ -3116,10 +3116,10 @@ void serde::Serializable<Circuit::BlackBoxFuncCall::BigIntNeg>::serialize(

template <>
template <typename Deserializer>
Circuit::BlackBoxFuncCall::BigIntNeg serde::Deserializable<Circuit::BlackBoxFuncCall::BigIntNeg>::deserialize(
Circuit::BlackBoxFuncCall::BigIntSub serde::Deserializable<Circuit::BlackBoxFuncCall::BigIntSub>::deserialize(
Deserializer& deserializer)
{
Circuit::BlackBoxFuncCall::BigIntNeg obj;
Circuit::BlackBoxFuncCall::BigIntSub obj;
obj.lhs = serde::Deserializable<decltype(obj.lhs)>::deserialize(deserializer);
obj.rhs = serde::Deserializable<decltype(obj.rhs)>::deserialize(deserializer);
obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
Expand Down Expand Up @@ -4273,7 +4273,7 @@ Circuit::BlackBoxOp::BigIntAdd serde::Deserializable<Circuit::BlackBoxOp::BigInt

namespace Circuit {

inline bool operator==(const BlackBoxOp::BigIntNeg& lhs, const BlackBoxOp::BigIntNeg& rhs)
inline bool operator==(const BlackBoxOp::BigIntSub& lhs, const BlackBoxOp::BigIntSub& rhs)
{
if (!(lhs.lhs == rhs.lhs)) {
return false;
Expand All @@ -4287,17 +4287,17 @@ inline bool operator==(const BlackBoxOp::BigIntNeg& lhs, const BlackBoxOp::BigIn
return true;
}

inline std::vector<uint8_t> BlackBoxOp::BigIntNeg::bincodeSerialize() const
inline std::vector<uint8_t> BlackBoxOp::BigIntSub::bincodeSerialize() const
{
auto serializer = serde::BincodeSerializer();
serde::Serializable<BlackBoxOp::BigIntNeg>::serialize(*this, serializer);
serde::Serializable<BlackBoxOp::BigIntSub>::serialize(*this, serializer);
return std::move(serializer).bytes();
}

inline BlackBoxOp::BigIntNeg BlackBoxOp::BigIntNeg::bincodeDeserialize(std::vector<uint8_t> input)
inline BlackBoxOp::BigIntSub BlackBoxOp::BigIntSub::bincodeDeserialize(std::vector<uint8_t> input)
{
auto deserializer = serde::BincodeDeserializer(input);
auto value = serde::Deserializable<BlackBoxOp::BigIntNeg>::deserialize(deserializer);
auto value = serde::Deserializable<BlackBoxOp::BigIntSub>::deserialize(deserializer);
if (deserializer.get_buffer_offset() < input.size()) {
throw_or_abort("Some input bytes were not read");
}
Expand All @@ -4308,7 +4308,7 @@ inline BlackBoxOp::BigIntNeg BlackBoxOp::BigIntNeg::bincodeDeserialize(std::vect

template <>
template <typename Serializer>
void serde::Serializable<Circuit::BlackBoxOp::BigIntNeg>::serialize(const Circuit::BlackBoxOp::BigIntNeg& obj,
void serde::Serializable<Circuit::BlackBoxOp::BigIntSub>::serialize(const Circuit::BlackBoxOp::BigIntSub& obj,
Serializer& serializer)
{
serde::Serializable<decltype(obj.lhs)>::serialize(obj.lhs, serializer);
Expand All @@ -4318,10 +4318,10 @@ void serde::Serializable<Circuit::BlackBoxOp::BigIntNeg>::serialize(const Circui

template <>
template <typename Deserializer>
Circuit::BlackBoxOp::BigIntNeg serde::Deserializable<Circuit::BlackBoxOp::BigIntNeg>::deserialize(
Circuit::BlackBoxOp::BigIntSub serde::Deserializable<Circuit::BlackBoxOp::BigIntSub>::deserialize(
Deserializer& deserializer)
{
Circuit::BlackBoxOp::BigIntNeg obj;
Circuit::BlackBoxOp::BigIntSub obj;
obj.lhs = serde::Deserializable<decltype(obj.lhs)>::deserialize(deserializer);
obj.rhs = serde::Deserializable<decltype(obj.rhs)>::deserialize(deserializer);
obj.output = serde::Deserializable<decltype(obj.output)>::deserialize(deserializer);
Expand Down

0 comments on commit b62f03c

Please sign in to comment.