mirror of
https://github.com/KhronosGroup/SPIRV-Tools
synced 2024-10-18 19:20:05 +00:00
1ed847f438
* Fix endianness of string literals To get correct and consistent encoding and decoding of string literals on big-endian platforms, use spvtools::utils::MakeString and MakeVector (or wrapper functions) consistently for handling string literals. - add variant of MakeVector that encodes a string literal into an existing vector of words - add variants of MakeString - add a wrapper spvDecodeLiteralStringOperand in source/ - fix wrapper Operand::AsString to use MakeString (source/opt) - remove Operand::AsCString as broken and unused - add a variant of GetOperandAs for string literals (source/val) ... and apply those wrappers throughout the code. Fixes #149 * Extend round trip test for StringLiterals to flip word order In the encoding/decoding roundtrip tests for string literals, include a case that flips byte order in words after encoding and then checks for successful decoding. That is, on a little-endian host flip to big-endian byte order and then decode, and vice versa. * BinaryParseTest.InstructionWithStringOperand: also flip byte order Test binary parsing of string operands both with the host's and with the reversed byte order.
56 lines
1.9 KiB
C++
56 lines
1.9 KiB
C++
// Copyright (c) 2015-2016 The Khronos Group Inc.
|
|
//
|
|
// 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.
|
|
|
|
#include "source/val/instruction.h"
|
|
|
|
#include <utility>
|
|
|
|
#include "source/binary.h"
|
|
#include "source/util/string_utils.h"
|
|
|
|
namespace spvtools {
|
|
namespace val {
|
|
|
|
Instruction::Instruction(const spv_parsed_instruction_t* inst)
|
|
: words_(inst->words, inst->words + inst->num_words),
|
|
operands_(inst->operands, inst->operands + inst->num_operands),
|
|
inst_({words_.data(), inst->num_words, inst->opcode, inst->ext_inst_type,
|
|
inst->type_id, inst->result_id, operands_.data(),
|
|
inst->num_operands}) {}
|
|
|
|
void Instruction::RegisterUse(const Instruction* inst, uint32_t index) {
|
|
uses_.push_back(std::make_pair(inst, index));
|
|
}
|
|
|
|
bool operator<(const Instruction& lhs, const Instruction& rhs) {
|
|
return lhs.id() < rhs.id();
|
|
}
|
|
bool operator<(const Instruction& lhs, uint32_t rhs) { return lhs.id() < rhs; }
|
|
bool operator==(const Instruction& lhs, const Instruction& rhs) {
|
|
return lhs.id() == rhs.id();
|
|
}
|
|
bool operator==(const Instruction& lhs, uint32_t rhs) {
|
|
return lhs.id() == rhs;
|
|
}
|
|
|
|
template <>
|
|
std::string Instruction::GetOperandAs<std::string>(size_t index) const {
|
|
const spv_parsed_operand_t& o = operands_.at(index);
|
|
assert(o.offset + o.num_words <= inst_.num_words);
|
|
return spvtools::utils::MakeString(words_.data() + o.offset, o.num_words);
|
|
}
|
|
|
|
} // namespace val
|
|
} // namespace spvtools
|