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.
47 lines
1.4 KiB
C++
47 lines
1.4 KiB
C++
// Copyright (c) 2017 Google 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/extensions.h"
|
|
|
|
#include <cassert>
|
|
#include <sstream>
|
|
#include <string>
|
|
|
|
#include "source/binary.h"
|
|
#include "source/enum_string_mapping.h"
|
|
|
|
namespace spvtools {
|
|
|
|
std::string GetExtensionString(const spv_parsed_instruction_t* inst) {
|
|
if (inst->opcode != SpvOpExtension) return "ERROR_not_op_extension";
|
|
|
|
assert(inst->num_operands == 1);
|
|
|
|
const auto& operand = inst->operands[0];
|
|
assert(operand.type == SPV_OPERAND_TYPE_LITERAL_STRING);
|
|
assert(inst->num_words > operand.offset);
|
|
(void)operand; /* No unused variables in release builds. */
|
|
|
|
return spvDecodeLiteralStringOperand(*inst, 0);
|
|
}
|
|
|
|
std::string ExtensionSetToString(const ExtensionSet& extensions) {
|
|
std::stringstream ss;
|
|
extensions.ForEach(
|
|
[&ss](Extension ext) { ss << ExtensionToString(ext) << " "; });
|
|
return ss.str();
|
|
}
|
|
|
|
} // namespace spvtools
|