aboutsummaryrefslogtreecommitdiff
path: root/dynasm
diff options
context:
space:
mode:
authorMike Pall <mike>2015-01-06 00:12:45 +0100
committerMike Pall <mike>2015-01-06 00:12:45 +0100
commit0a5045c34e0d2902e38c1f8f65c5bbc2fdc63535 (patch)
tree79adfce53c856e0b066683352fd95cb40c97b3c5 /dynasm
parentc71cdf4c36145dd052734779d297fdbd7455468f (diff)
parent86913b9bbf75c78a5dcfa2bf6071db8db7df7c51 (diff)
downloadluajit-0a5045c34e0d2902e38c1f8f65c5bbc2fdc63535.tar.gz
luajit-0a5045c34e0d2902e38c1f8f65c5bbc2fdc63535.tar.bz2
luajit-0a5045c34e0d2902e38c1f8f65c5bbc2fdc63535.zip
Merge branch 'master' into v2.1
Diffstat (limited to 'dynasm')
-rw-r--r--dynasm/dasm_arm.h2
-rw-r--r--dynasm/dasm_arm.lua2
-rw-r--r--dynasm/dasm_arm64.h2
-rw-r--r--dynasm/dasm_arm64.lua2
-rw-r--r--dynasm/dasm_mips.h2
-rw-r--r--dynasm/dasm_mips.lua2
-rw-r--r--dynasm/dasm_ppc.h2
-rw-r--r--dynasm/dasm_ppc.lua2
-rw-r--r--dynasm/dasm_proto.h2
-rw-r--r--dynasm/dasm_x64.lua2
-rw-r--r--dynasm/dasm_x86.h2
-rw-r--r--dynasm/dasm_x86.lua2
-rw-r--r--dynasm/dynasm.lua4
13 files changed, 14 insertions, 14 deletions
diff --git a/dynasm/dasm_arm.h b/dynasm/dasm_arm.h
index 435bbf5e..57e0116f 100644
--- a/dynasm/dasm_arm.h
+++ b/dynasm/dasm_arm.h
@@ -1,6 +1,6 @@
1/* 1/*
2** DynASM ARM encoding engine. 2** DynASM ARM encoding engine.
3** Copyright (C) 2005-2014 Mike Pall. All rights reserved. 3** Copyright (C) 2005-2015 Mike Pall. All rights reserved.
4** Released under the MIT license. See dynasm.lua for full copyright notice. 4** Released under the MIT license. See dynasm.lua for full copyright notice.
5*/ 5*/
6 6
diff --git a/dynasm/dasm_arm.lua b/dynasm/dasm_arm.lua
index d5078f7e..90a259c5 100644
--- a/dynasm/dasm_arm.lua
+++ b/dynasm/dasm_arm.lua
@@ -1,7 +1,7 @@
1------------------------------------------------------------------------------ 1------------------------------------------------------------------------------
2-- DynASM ARM module. 2-- DynASM ARM module.
3-- 3--
4-- Copyright (C) 2005-2014 Mike Pall. All rights reserved. 4-- Copyright (C) 2005-2015 Mike Pall. All rights reserved.
5-- See dynasm.lua for full copyright notice. 5-- See dynasm.lua for full copyright notice.
6------------------------------------------------------------------------------ 6------------------------------------------------------------------------------
7 7
diff --git a/dynasm/dasm_arm64.h b/dynasm/dasm_arm64.h
index 4a9a49bc..78451bf6 100644
--- a/dynasm/dasm_arm64.h
+++ b/dynasm/dasm_arm64.h
@@ -1,6 +1,6 @@
1/* 1/*
2** DynASM ARM64 encoding engine. 2** DynASM ARM64 encoding engine.
3** Copyright (C) 2005-2014 Mike Pall. All rights reserved. 3** Copyright (C) 2005-2015 Mike Pall. All rights reserved.
4** Released under the MIT license. See dynasm.lua for full copyright notice. 4** Released under the MIT license. See dynasm.lua for full copyright notice.
5*/ 5*/
6 6
diff --git a/dynasm/dasm_arm64.lua b/dynasm/dasm_arm64.lua
index 125d722b..9766e475 100644
--- a/dynasm/dasm_arm64.lua
+++ b/dynasm/dasm_arm64.lua
@@ -1,7 +1,7 @@
1------------------------------------------------------------------------------ 1------------------------------------------------------------------------------
2-- DynASM ARM64 module. 2-- DynASM ARM64 module.
3-- 3--
4-- Copyright (C) 2005-2014 Mike Pall. All rights reserved. 4-- Copyright (C) 2005-2015 Mike Pall. All rights reserved.
5-- See dynasm.lua for full copyright notice. 5-- See dynasm.lua for full copyright notice.
6------------------------------------------------------------------------------ 6------------------------------------------------------------------------------
7 7
diff --git a/dynasm/dasm_mips.h b/dynasm/dasm_mips.h
index 43595889..2f4c2d22 100644
--- a/dynasm/dasm_mips.h
+++ b/dynasm/dasm_mips.h
@@ -1,6 +1,6 @@
1/* 1/*
2** DynASM MIPS encoding engine. 2** DynASM MIPS encoding engine.
3** Copyright (C) 2005-2014 Mike Pall. All rights reserved. 3** Copyright (C) 2005-2015 Mike Pall. All rights reserved.
4** Released under the MIT license. See dynasm.lua for full copyright notice. 4** Released under the MIT license. See dynasm.lua for full copyright notice.
5*/ 5*/
6 6
diff --git a/dynasm/dasm_mips.lua b/dynasm/dasm_mips.lua
index 82942cbb..ae0dbd7a 100644
--- a/dynasm/dasm_mips.lua
+++ b/dynasm/dasm_mips.lua
@@ -1,7 +1,7 @@
1------------------------------------------------------------------------------ 1------------------------------------------------------------------------------
2-- DynASM MIPS module. 2-- DynASM MIPS module.
3-- 3--
4-- Copyright (C) 2005-2014 Mike Pall. All rights reserved. 4-- Copyright (C) 2005-2015 Mike Pall. All rights reserved.
5-- See dynasm.lua for full copyright notice. 5-- See dynasm.lua for full copyright notice.
6------------------------------------------------------------------------------ 6------------------------------------------------------------------------------
7 7
diff --git a/dynasm/dasm_ppc.h b/dynasm/dasm_ppc.h
index 5ccff250..7df49365 100644
--- a/dynasm/dasm_ppc.h
+++ b/dynasm/dasm_ppc.h
@@ -1,6 +1,6 @@
1/* 1/*
2** DynASM PPC encoding engine. 2** DynASM PPC encoding engine.
3** Copyright (C) 2005-2014 Mike Pall. All rights reserved. 3** Copyright (C) 2005-2015 Mike Pall. All rights reserved.
4** Released under the MIT license. See dynasm.lua for full copyright notice. 4** Released under the MIT license. See dynasm.lua for full copyright notice.
5*/ 5*/
6 6
diff --git a/dynasm/dasm_ppc.lua b/dynasm/dasm_ppc.lua
index 61da50ef..91f4ff9a 100644
--- a/dynasm/dasm_ppc.lua
+++ b/dynasm/dasm_ppc.lua
@@ -1,7 +1,7 @@
1------------------------------------------------------------------------------ 1------------------------------------------------------------------------------
2-- DynASM PPC module. 2-- DynASM PPC module.
3-- 3--
4-- Copyright (C) 2005-2014 Mike Pall. All rights reserved. 4-- Copyright (C) 2005-2015 Mike Pall. All rights reserved.
5-- See dynasm.lua for full copyright notice. 5-- See dynasm.lua for full copyright notice.
6------------------------------------------------------------------------------ 6------------------------------------------------------------------------------
7 7
diff --git a/dynasm/dasm_proto.h b/dynasm/dasm_proto.h
index e77bb844..a8bc6fd2 100644
--- a/dynasm/dasm_proto.h
+++ b/dynasm/dasm_proto.h
@@ -1,6 +1,6 @@
1/* 1/*
2** DynASM encoding engine prototypes. 2** DynASM encoding engine prototypes.
3** Copyright (C) 2005-2014 Mike Pall. All rights reserved. 3** Copyright (C) 2005-2015 Mike Pall. All rights reserved.
4** Released under the MIT license. See dynasm.lua for full copyright notice. 4** Released under the MIT license. See dynasm.lua for full copyright notice.
5*/ 5*/
6 6
diff --git a/dynasm/dasm_x64.lua b/dynasm/dasm_x64.lua
index 91d676d1..b1b62022 100644
--- a/dynasm/dasm_x64.lua
+++ b/dynasm/dasm_x64.lua
@@ -1,7 +1,7 @@
1------------------------------------------------------------------------------ 1------------------------------------------------------------------------------
2-- DynASM x64 module. 2-- DynASM x64 module.
3-- 3--
4-- Copyright (C) 2005-2014 Mike Pall. All rights reserved. 4-- Copyright (C) 2005-2015 Mike Pall. All rights reserved.
5-- See dynasm.lua for full copyright notice. 5-- See dynasm.lua for full copyright notice.
6------------------------------------------------------------------------------ 6------------------------------------------------------------------------------
7-- This module just sets 64 bit mode for the combined x86/x64 module. 7-- This module just sets 64 bit mode for the combined x86/x64 module.
diff --git a/dynasm/dasm_x86.h b/dynasm/dasm_x86.h
index 97cbbea8..652e8c99 100644
--- a/dynasm/dasm_x86.h
+++ b/dynasm/dasm_x86.h
@@ -1,6 +1,6 @@
1/* 1/*
2** DynASM x86 encoding engine. 2** DynASM x86 encoding engine.
3** Copyright (C) 2005-2014 Mike Pall. All rights reserved. 3** Copyright (C) 2005-2015 Mike Pall. All rights reserved.
4** Released under the MIT license. See dynasm.lua for full copyright notice. 4** Released under the MIT license. See dynasm.lua for full copyright notice.
5*/ 5*/
6 6
diff --git a/dynasm/dasm_x86.lua b/dynasm/dasm_x86.lua
index 5f82f4f3..7ca061d2 100644
--- a/dynasm/dasm_x86.lua
+++ b/dynasm/dasm_x86.lua
@@ -1,7 +1,7 @@
1------------------------------------------------------------------------------ 1------------------------------------------------------------------------------
2-- DynASM x86/x64 module. 2-- DynASM x86/x64 module.
3-- 3--
4-- Copyright (C) 2005-2014 Mike Pall. All rights reserved. 4-- Copyright (C) 2005-2015 Mike Pall. All rights reserved.
5-- See dynasm.lua for full copyright notice. 5-- See dynasm.lua for full copyright notice.
6------------------------------------------------------------------------------ 6------------------------------------------------------------------------------
7 7
diff --git a/dynasm/dynasm.lua b/dynasm/dynasm.lua
index 0ea8697c..fffda751 100644
--- a/dynasm/dynasm.lua
+++ b/dynasm/dynasm.lua
@@ -2,7 +2,7 @@
2-- DynASM. A dynamic assembler for code generation engines. 2-- DynASM. A dynamic assembler for code generation engines.
3-- Originally designed and implemented for LuaJIT. 3-- Originally designed and implemented for LuaJIT.
4-- 4--
5-- Copyright (C) 2005-2014 Mike Pall. All rights reserved. 5-- Copyright (C) 2005-2015 Mike Pall. All rights reserved.
6-- See below for full copyright notice. 6-- See below for full copyright notice.
7------------------------------------------------------------------------------ 7------------------------------------------------------------------------------
8 8
@@ -17,7 +17,7 @@ local _info = {
17 url = "http://luajit.org/dynasm.html", 17 url = "http://luajit.org/dynasm.html",
18 license = "MIT", 18 license = "MIT",
19 copyright = [[ 19 copyright = [[
20Copyright (C) 2005-2014 Mike Pall. All rights reserved. 20Copyright (C) 2005-2015 Mike Pall. All rights reserved.
21 21
22Permission is hereby granted, free of charge, to any person obtaining 22Permission is hereby granted, free of charge, to any person obtaining
23a copy of this software and associated documentation files (the 23a copy of this software and associated documentation files (the
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-15 21:13:35 +0000