f1e37a4987
Follow the change: https://github.com/apache/nuttx/pull/9151, that is no need to deal with zero size in C++ allocator. Signed-off-by: fangxinyong <fangxinyong@xiaomi.com>
88 lines
2.9 KiB
C++
88 lines
2.9 KiB
C++
//***************************************************************************
|
|
// libs/libxx/libcxxmini/libxx_newa.cxx
|
|
//
|
|
// Licensed to the Apache Software Foundation (ASF) under one or more
|
|
// contributor license agreements. See the NOTICE file distributed with
|
|
// this work for additional information regarding copyright ownership. The
|
|
// ASF licenses this file to you 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
|
|
//
|
|
//***************************************************************************
|
|
|
|
//***************************************************************************
|
|
// Included Files
|
|
//***************************************************************************
|
|
|
|
#include <nuttx/config.h>
|
|
#include <assert.h>
|
|
#include <cstddef>
|
|
#include <debug.h>
|
|
|
|
#include <nuttx/lib/lib.h>
|
|
|
|
//***************************************************************************
|
|
// Pre-processor Definitions
|
|
//***************************************************************************
|
|
|
|
//***************************************************************************
|
|
// Private Data
|
|
//***************************************************************************
|
|
|
|
//***************************************************************************
|
|
// Operators
|
|
//***************************************************************************
|
|
|
|
//***************************************************************************
|
|
// Name: new
|
|
//
|
|
// NOTE:
|
|
// This should take a type of size_t. But size_t has an unknown underlying
|
|
// type. In the nuttx sys/types.h header file, size_t is typed as uint32_t
|
|
// (which is determined by architecture-specific logic). But the C++
|
|
// compiler may believe that size_t is of a different type resulting in
|
|
// compilation errors in the operator. Using the underlying integer type
|
|
// instead of size_t seems to resolve the compilation issues. Need to
|
|
// REVISIT this.
|
|
//
|
|
//***************************************************************************
|
|
|
|
FAR void *operator new[](std::size_t nbytes)
|
|
{
|
|
// Perform the allocation
|
|
|
|
FAR void *alloc = lib_malloc(nbytes);
|
|
|
|
#ifdef CONFIG_DEBUG_ERROR
|
|
if (alloc == 0)
|
|
{
|
|
// Oh my.. we are required to return a valid pointer and
|
|
// we cannot throw an exception! We are bad.
|
|
|
|
_err("ERROR: Failed to allocate\n");
|
|
}
|
|
#endif
|
|
|
|
DEBUGASSERT(alloc != NULL);
|
|
|
|
// Return the allocated value
|
|
|
|
return alloc;
|
|
}
|
|
|
|
FAR void *operator new[](std::size_t nbytes, FAR void *ptr)
|
|
{
|
|
DEBUGASSERT(ptr != NULL);
|
|
|
|
// Return the ptr pointer
|
|
|
|
return ptr;
|
|
}
|