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.
44 lines
1.8 KiB
C++
44 lines
1.8 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.
|
|
|
|
#ifndef SOURCE_BINARY_H_
|
|
#define SOURCE_BINARY_H_
|
|
|
|
#include <string>
|
|
|
|
#include "source/spirv_definition.h"
|
|
#include "spirv-tools/libspirv.h"
|
|
|
|
// Functions
|
|
|
|
// Grabs the header from the SPIR-V module given in the binary parameter. The
|
|
// endian parameter specifies the endianness of the binary module. On success,
|
|
// returns SPV_SUCCESS and writes the parsed header into *header.
|
|
spv_result_t spvBinaryHeaderGet(const spv_const_binary binary,
|
|
const spv_endianness_t endian,
|
|
spv_header_t* header);
|
|
|
|
// Returns the number of non-null characters in str before the first null
|
|
// character, or strsz if there is no null character. Examines at most the
|
|
// first strsz characters in str. Returns 0 if str is nullptr. This is a
|
|
// replacement for C11's strnlen_s which might not exist in all environments.
|
|
size_t spv_strnlen_s(const char* str, size_t strsz);
|
|
|
|
// Decode the string literal operand with index operand_index from instruction
|
|
// inst.
|
|
std::string spvDecodeLiteralStringOperand(const spv_parsed_instruction_t& inst,
|
|
const uint16_t operand_index);
|
|
|
|
#endif // SOURCE_BINARY_H_
|