diff options
| -rw-r--r-- | src/library.js | 106 | ||||
| -rw-r--r-- | src/library_sdl.js | 8 | ||||
| -rw-r--r-- | src/parseTools.js | 2 | ||||
| -rw-r--r-- | src/postamble.js | 6 | ||||
| -rw-r--r-- | tests/runner.py | 16 |
5 files changed, 69 insertions, 69 deletions
diff --git a/src/library.js b/src/library.js index ab560ad4..aedd04c9 100644 --- a/src/library.js +++ b/src/library.js @@ -61,7 +61,7 @@ var Library = { }, sscanf: '_scanString', - _formatString__deps: ['STDIO'], + _formatString__deps: ['$STDIO'], _formatString: function() { function isFloatArg(type) { return String.fromCharCode(type) in Runtime.set('f', 'e', 'g'); @@ -253,8 +253,8 @@ var Library = { // stdio.h - file functions - STDIO__postset: '_STDIO.init()', - STDIO: { // TODO: Rewrite this so it works with closure compiler, allowing us to use ADVANCED optimizations there + $STDIO__postset: 'STDIO.init()', + $STDIO: { streams: {}, filenames: {}, counter: 1, @@ -264,24 +264,24 @@ var Library = { init: function() { try { _stdin = Pointer_make([0], null, ALLOC_STATIC); - IHEAP[_stdin] = this.prepare('<<stdin>>'); + IHEAP[_stdin] = STDIO.prepare('<<stdin>>'); } catch(e){} // stdin/out/err may not exist if not needed try { _stdout = Pointer_make([0], null, ALLOC_STATIC); - IHEAP[_stdout] = this.prepare('<<stdout>>', null, true); + IHEAP[_stdout] = STDIO.prepare('<<stdout>>', null, true); } catch(e){} try { _stderr = Pointer_make([0], null, ALLOC_STATIC); - IHEAP[_stderr] = this.prepare('<<stderr>>', null, true); + IHEAP[_stderr] = STDIO.prepare('<<stderr>>', null, true); } catch(e){} }, cleanFilename: function(filename) { return filename.replace('./', ''); }, prepare: function(filename, data, print_) { - filename = this.cleanFilename(filename); - var stream = this.counter++; - this.streams[stream] = { + filename = STDIO.cleanFilename(filename); + var stream = STDIO.counter++; + STDIO.streams[stream] = { filename: filename, data: data ? data : [], position: 0, @@ -289,26 +289,26 @@ var Library = { error: 0, print: print_ // true for stdout and stderr - we print when receiving data for them }; - this.filenames[filename] = stream; + STDIO.filenames[filename] = stream; return stream; }, open: function(filename) { - filename = this.cleanFilename(filename); - var stream = _STDIO.filenames[filename]; + filename = STDIO.cleanFilename(filename); + var stream = STDIO.filenames[filename]; if (!stream) { // Not already cached; try to load it right now try { - return _STDIO.prepare(filename, readBinary(filename)); + return STDIO.prepare(filename, readBinary(filename)); } catch(e) { return 0; } } - var info = _STDIO.streams[stream]; + var info = STDIO.streams[stream]; info.position = info.error = info.eof = 0; return stream; }, read: function(stream, ptr, size) { - var info = _STDIO.streams[stream]; + var info = STDIO.streams[stream]; if (!info) return -1; for (var i = 0; i < size; i++) { if (info.position >= info.data.length) { @@ -322,7 +322,7 @@ var Library = { return size; }, write: function(stream, ptr, size) { - var info = _STDIO.streams[stream]; + var info = STDIO.streams[stream]; if (!info) return -1; if (info.print) { __print__(intArrayToString(Array_copy(ptr, size))); @@ -337,33 +337,33 @@ var Library = { } }, - fopen__deps: ['STDIO'], + fopen__deps: ['$STDIO'], fopen: function(filename, mode) { filename = Pointer_stringify(filename); mode = Pointer_stringify(mode); if (mode.indexOf('r') >= 0) { - return _STDIO.open(filename); + return STDIO.open(filename); } else if (mode.indexOf('w') >= 0) { - return _STDIO.prepare(filename); + return STDIO.prepare(filename); } else { return assert(false, 'fopen with odd params: ' + mode); } }, __01fopen64_: 'fopen', - rewind__deps: ['STDIO'], + rewind__deps: ['$STDIO'], rewind: function(stream) { - var info = _STDIO.streams[stream]; + var info = STDIO.streams[stream]; info.position = 0; info.error = 0; }, - fseek__deps: ['STDIO'], + fseek__deps: ['$STDIO'], fseek: function(stream, offset, whence) { - var info = _STDIO.streams[stream]; - if (whence === _STDIO.SEEK_CUR) { + var info = STDIO.streams[stream]; + if (whence === STDIO.SEEK_CUR) { offset += info.position; - } else if (whence === _STDIO.SEEK_END) { + } else if (whence === STDIO.SEEK_END) { offset += info.data.length; } info.position = offset; @@ -372,80 +372,80 @@ var Library = { }, __01fseeko64_: 'fseek', - ftell__deps: ['STDIO'], + ftell__deps: ['$STDIO'], ftell: function(stream) { - return _STDIO.streams[stream].position; + return STDIO.streams[stream].position; }, __01ftello64_: 'ftell', - fread__deps: ['STDIO'], + fread__deps: ['$STDIO'], fread: function(ptr, size, count, stream) { - var info = _STDIO.streams[stream]; + var info = STDIO.streams[stream]; for (var i = 0; i < count; i++) { if (info.position + size > info.data.length) { info.eof = 1; return i; } - _STDIO.read(stream, ptr, size); + STDIO.read(stream, ptr, size); ptr += size; } return count; }, - fwrite__deps: ['STDIO'], + fwrite__deps: ['$STDIO'], fwrite: function(ptr, size, count, stream) { - _STDIO.write(stream, ptr, size*count); + STDIO.write(stream, ptr, size*count); return count; }, - fclose__deps: ['STDIO'], + fclose__deps: ['$STDIO'], fclose: function(stream) { return 0; }, - feof__deps: ['STDIO'], + feof__deps: ['$STDIO'], feof: function(stream) { - return _STDIO.streams[stream].eof; + return STDIO.streams[stream].eof; }, - ferror__deps: ['STDIO'], + ferror__deps: ['$STDIO'], ferror: function(stream) { - return _STDIO.streams[stream].error; + return STDIO.streams[stream].error; }, - fprintf__deps: ['_formatString', 'STDIO'], + fprintf__deps: ['_formatString', '$STDIO'], fprintf: function() { var stream = arguments[0]; var args = Array.prototype.slice.call(arguments, 1); var ptr = __formatString.apply(null, args); - _STDIO.write(stream, ptr, String_len(ptr)); + STDIO.write(stream, ptr, String_len(ptr)); }, - vfprintf__deps: ['STDIO', '_formatString'], + vfprintf__deps: ['$STDIO', '_formatString'], vfprintf: function(stream, format, args) { var ptr = __formatString(-format, args); - _STDIO.write(stream, ptr, String_len(ptr)); + STDIO.write(stream, ptr, String_len(ptr)); }, - fflush__deps: ['STDIO'], + fflush__deps: ['$STDIO'], fflush: function(stream) { - var info = _STDIO.streams[stream]; + var info = STDIO.streams[stream]; if (info && info.print) { __print__(null); } }, - fputs__deps: ['STDIO', 'fputc'], + fputs__deps: ['$STDIO', 'fputc'], fputs: function(p, stream) { - _STDIO.write(stream, p, String_len(p)); + STDIO.write(stream, p, String_len(p)); _fputc('\n'.charCodeAt(0), stream); }, - fputc__deps: ['STDIO'], + fputc__deps: ['$STDIO'], fputc: function(chr, stream) { if (!_fputc.ptr) _fputc.ptr = _malloc(1); {{{ makeSetValue('_fputc.ptr', '0', 'chr', 'i8') }}} - _STDIO.write(stream, _fputc.ptr, 1); + STDIO.write(stream, _fputc.ptr, 1); }, // unix file IO, see http://rabbit.eng.miami.edu/info/functions/unixio.html @@ -453,9 +453,9 @@ var Library = { open: function(filename, flags, mode) { filename = Pointer_stringify(filename); if (flags === 0) { // RDONLY - return _STDIO.open(filename); + return STDIO.open(filename); } else if (flags === 1) { // WRONLY - return _STDIO.prepare(filename); + return STDIO.prepare(filename); } else { return assert(false, 'open with odd params: ' + [flags, mode]); } @@ -466,13 +466,13 @@ var Library = { }, read: function(stream, ptr, numbytes) { - return _STDIO.read(stream, ptr, numbytes); + return STDIO.read(stream, ptr, numbytes); }, fcntl: function() { }, // TODO... fstat: function(stream, ptr) { - var info = _STDIO.streams[stream]; + var info = STDIO.streams[stream]; if (!info) return -1; try { {{{ makeSetValue('ptr', '$struct_stat___FLATTENER[9]', 'info.data.length', 'i32') }}} // st_size. XXX: hardcoded index 9 into the structure. @@ -485,7 +485,7 @@ var Library = { mmap: function(start, num, prot, flags, stream, offset) { // Leaky and non-shared... FIXME - var info = _STDIO.streams[stream]; + var info = STDIO.streams[stream]; if (!info) return -1; return Pointer_make(info.data.slice(offset, offset+num), null, ALLOC_NORMAL); }, @@ -503,7 +503,7 @@ var Library = { access: function(filename) { filename = Pointer_stringify(filename); - return _STDIO.open(filename) ? 0 : -1; + return STDIO.open(filename) ? 0 : -1; }, // stdlib.h diff --git a/src/library_sdl.js b/src/library_sdl.js index 4e2785b1..95f30037 100644 --- a/src/library_sdl.js +++ b/src/library_sdl.js @@ -72,8 +72,8 @@ mergeInto(Library, { SDL.surfaces[surf] = { width: width, height: height, - canvas: Module.canvas, - ctx: Module.ctx2D, + canvas: Module['canvas'], + ctx: Module['ctx2D'], surf: surf, buffer: buffer, pixelFormat: pixelFormat, @@ -212,8 +212,8 @@ mergeInto(Library, { surfData.image.data[i] = IHEAP[surfData.buffer+i]; // XXX - make sure alpha values are proper in your input } } else { - var width = Module.canvas.width; - var height = Module.canvas.height; + var width = Module['canvas'].width; + var height = Module['canvas'].height; var s = surfData.buffer; var data = surfData.image.data; var colors = surfData.colors; diff --git a/src/parseTools.js b/src/parseTools.js index e2ecd074..2d94f73b 100644 --- a/src/parseTools.js +++ b/src/parseTools.js @@ -753,7 +753,7 @@ function makeGetSlabs(ptr, type, allowMultiple) { return ['HEAP']; } else { if (type in Runtime.FLOAT_TYPES || type === 'int64') { - warn(USE_TYPED_ARRAY_FHEAP, 'Attempt to use FHEAP without USE_TYPED_ARRAY_FHEAP'); + assert(USE_TYPED_ARRAY_FHEAP, 'Attempt to use FHEAP without USE_TYPED_ARRAY_FHEAP'); return ['FHEAP']; } else if (type in Runtime.INT_TYPES || isPointerType(type) || !USE_TYPED_ARRAY_FHEAP) { return ['IHEAP']; diff --git a/src/postamble.js b/src/postamble.js index 4943b9e8..12d4ebca 100644 --- a/src/postamble.js +++ b/src/postamble.js @@ -21,7 +21,7 @@ Module.callMain = function callMain(args) { } function run(args) { - args = args || Module.arguments; + args = args || Module['arguments']; __initializeRuntime__(); @@ -42,10 +42,10 @@ Module['run'] = run; #if INVOKE_RUN #else -Module.noInitialRun = true; +Module['noInitialRun'] = true; #endif -if (!Module.noInitialRun) { +if (!Module['noInitialRun']) { run(); } diff --git a/tests/runner.py b/tests/runner.py index 1a240240..42b300f1 100644 --- a/tests/runner.py +++ b/tests/runner.py @@ -1686,7 +1686,7 @@ if 'benchmark' not in sys.argv: def post(filename): src = open(filename, 'r').read().replace( '// {{PRE_RUN_ADDITIONS}}', - '''this._STDIO.prepare('somefile.binary', [100, 200, 50, 25, 10, 77, 123]);''' # 200 becomes -56, since signed chars are used in memory + '''STDIO.prepare('somefile.binary', [100, 200, 50, 25, 10, 77, 123]);''' # 200 becomes -56, since signed chars are used in memory ) open(filename, 'w').write(src) @@ -1853,7 +1853,7 @@ if 'benchmark' not in sys.argv: # Embed the font into the document src = open(filename, 'r').read().replace( '// {{PRE_RUN_ADDITIONS}}', - '''this._STDIO.prepare('font.ttf', %s);''' % str( + '''STDIO.prepare('font.ttf', %s);''' % str( map(ord, open(path_from_root('tests', 'freetype', 'LiberationSansBold.ttf'), 'rb').read()) ) ) @@ -1957,9 +1957,9 @@ if 'benchmark' not in sys.argv: src = open(filename, 'a') src.write( ''' - _STDIO.prepare('paper.pdf', eval(read('paper.pdf.js'))); + STDIO.prepare('paper.pdf', eval(read('paper.pdf.js'))); run(); - print("Data: " + JSON.stringify(_STDIO.streams[_STDIO.filenames['*s-0*d.']].data)); // work around __formatString__ fail + print("Data: " + JSON.stringify(STDIO.streams[STDIO.filenames['*s-0*d.']].data)); // work around __formatString__ fail ''' ) src.close() @@ -2003,12 +2003,12 @@ if 'benchmark' not in sys.argv: def post(filename): src = open(filename, 'r').read().replace( '// {{PRE_RUN_ADDITIONS}}', - '''this._STDIO.prepare('image.j2k', %s);''' % line_splitter(str( + '''STDIO.prepare('image.j2k', %s);''' % line_splitter(str( map(ord, open(original_j2k, 'rb').read()) )) ).replace( '// {{POST_RUN_ADDITIONS}}', - '''print("Data: " + JSON.stringify(this._STDIO.streams[this._STDIO.filenames['image.raw']].data));''' + '''print("Data: " + JSON.stringify(STDIO.streams[STDIO.filenames['image.raw']].data));''' ) open(filename, 'w').write(src) @@ -2183,10 +2183,10 @@ if 'benchmark' not in sys.argv: ''' def post(filename): Popen(['python', DEMANGLER, filename], stdout=open(filename + '.tmp', 'w')).communicate() - Popen(['python', NAMESPACER, filename + '.tmp'], stdout=open(filename + '.tmp2', 'w')).communicate() + Popen(['python', NAMESPACER, filename, filename + '.tmp'], stdout=open(filename + '.tmp2', 'w')).communicate() src = open(filename, 'r').read().replace( '// {{MODULE_ADDITIONS}', - 'Module["_"] = ' + open(filename + '.tmp2', 'r').read().rstrip() + ';\n\n' + script_src + '\n\n' + + 'Module["_"] = ' + open(filename + '.tmp2', 'r').read().replace('var ModuleNames = ', '').rstrip() + ';\n\n' + script_src + '\n\n' + '// {{MODULE_ADDITIONS}' ) open(filename, 'w').write(src) |