Merge with master

This commit is contained in:
Ilmir Usmanov
2014-07-15 21:42:05 +04:00
36 changed files with 962 additions and 569 deletions
+3 -3
View File
@@ -20,9 +20,9 @@
* Handle failed assertion
*/
void __noreturn
jerry_AssertFail(const char *assertion, /**< assertion condition string */
const char *file, /**< file name */
const uint32_t line) /** line */
jerry_AssertFail(const char *assertion __unused, /**< assertion condition string */
const char *file __unused, /**< file name */
const uint32_t line __unused) /** line */
{
__exit( -ERR_GENERAL);
} /* jerry_AssertFail */
+8 -3
View File
@@ -36,8 +36,13 @@ __printf(const char *format, /**< format string */
va_start( args, format);
int ret = vprintf( format, args);
/**
* TODO: Call internal vprintf implementation when it appears.
*/
int ret = 0;
JERRY_UNIMPLEMENTED();
va_end( args);
return ret;
@@ -52,7 +57,7 @@ __putchar (int c)
/** exit - cause normal process termination */
void __noreturn
__exit (int status)
__exit (int status __unused)
{
/**
* TODO: Blink LEDs? status -> binary -> LEDs?
@@ -13,6 +13,17 @@
* limitations under the License.
*/
#include "serializer.h"
#include "globals.h"
void
serializer_init (void)
{
}
void
serializer_dump_data (const void *data __unused, size_t size __unused)
{
}
TODO (Dump memory)